@hebcal/core 3.38.0 → 3.39.0

package/dist/index.mjs

@@ -1,8 +1,12 @@
-/*! @hebcal/core v3.38.0 */
-/**
+/*! @hebcal/core v3.39.0 */
+/*
  * More minimal greg routines
  */
+
+/** @private */
 const lengths = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+/** @private */
+
 const monthLengths = [lengths, lengths.slice()];
 monthLengths[1][2] = 29;
 /**
@@ -67,7 +71,7 @@ function isDate(obj) {
 
 function dayOfYear(date) {
   if (!isDate(date)) {
-    throw new TypeError('Argument to greg.dayOfYear not a Date');
+    throw new TypeError(`Argument not a Date: ${date}`);
   }
 
   let doy = date.getDate() + 31 * date.getMonth();
@@ -92,7 +96,7 @@ function dayOfYear(date) {
 
 function greg2abs(date) {
   if (!isDate(date)) {
-    throw new TypeError('Argument to greg.greg2abs not a Date');
+    throw new TypeError(`Argument not a Date: ${date}`);
   }
 
   const year = date.getFullYear() - 1;
@@ -147,7 +151,7 @@ function toFixed(year, month, day) {
 
 function abs2greg(abs) {
   if (typeof abs !== 'number') {
-    throw new TypeError('Argument to greg.abs2greg not a Number');
+    throw new TypeError(`Argument not a Number: ${abs}`);
   }
 
   abs = Math.trunc(abs);
@@ -615,7 +619,7 @@ Locale.addLocale('s', noopLocale);
 Locale.addLocale('', noopLocale);
 Locale.useLocale('en');
 
-/**
+/*
  * More minimal HDate
  */
 const NISAN$3 = 1;
@@ -693,6 +697,7 @@ const AVG_HEBYEAR_DAYS = 365.24682220597794;
  * Converts Hebrew date to R.D. (Rata Die) fixed days.
  * R.D. 1 is the imaginary date Monday, January 1, 1 on the Gregorian
  * Calendar.
+ * @private
  * @param {number} year Hebrew year
  * @param {number} month Hebrew month
  * @param {number} day Hebrew date (1-30)
@@ -725,25 +730,7 @@ function hebrew2abs(year, month, day) {
  */
 
 function newYear(year) {
-  return EPOCH + elapsedDays(year) + newYearDelay(year);
-}
-/**
- * @private
- * @param {number} year
- * @return {number}
- */
-
-
-function newYearDelay(year) {
-  const ny1 = elapsedDays(year);
-  const ny2 = elapsedDays(year + 1);
-
-  if (ny2 - ny1 === 356) {
-    return 2;
-  } else {
-    const ny0 = elapsedDays(year - 1);
-    return ny1 - ny0 === 382 ? 1 : 0;
-  }
+  return EPOCH + elapsedDays(year);
 }
 /**
  * Converts absolute R.D. days to Hebrew date
@@ -782,6 +769,7 @@ function abs2hebrew(abs) {
 }
 /**
  * Returns true if Hebrew year is a leap year
+ * @private
  * @param {number} year Hebrew year
  * @return {boolean}
  */
@@ -791,6 +779,7 @@ function isLeapYear(year) {
 }
 /**
  * Number of months in this Hebrew year (either 12 or 13 depending on leap year)
+ * @private
  * @param {number} year Hebrew year
  * @return {number}
  */
@@ -800,6 +789,7 @@ function monthsInYear(year) {
 }
 /**
  * Number of days in Hebrew month in a given year (29 or 30)
+ * @private
  * @param {number} month Hebrew month (e.g. months.TISHREI)
  * @param {number} year Hebrew year
  * @return {number}
@@ -824,13 +814,14 @@ function daysInMonth(month, year) {
 /**
  * Returns a transliterated string name of Hebrew month in year,
  * for example 'Elul' or 'Cheshvan'.
+ * @private
  * @param {number} month Hebrew month (e.g. months.TISHREI)
  * @param {number} year Hebrew year
  * @return {string}
  */
 
 function getMonthName(month, year) {
-  if (typeof month !== 'number' || month < 1 || month > 14) {
+  if (typeof month !== 'number' || isNaN(month) || month < 1 || month > 14) {
     throw new TypeError(`bad month argument ${month}`);
   }
 
@@ -839,6 +830,7 @@ function getMonthName(month, year) {
 /**
  * Days from sunday prior to start of Hebrew calendar to mean
  * conjunction of Tishrei in Hebrew YEAR
+ * @private
  * @param {number} year Hebrew year
  * @return {number}
  */
@@ -869,7 +861,10 @@ function elapsedDays0(year) {
   return altDay + (altDay % 7 === 0 || altDay % 7 === 3 || altDay % 7 === 5);
 }
 /**
- * Number of days in the hebrew YEAR
+ * Number of days in the hebrew YEAR.
+ * A common Hebrew calendar year can have a length of 353, 354 or 355 days
+ * A leap Hebrew calendar year can have a length of 383, 384 or 385 days
+ * @private
  * @param {number} year Hebrew year
  * @return {number}
  */
@@ -880,6 +875,7 @@ function daysInYear(year) {
 }
 /**
  * true if Cheshvan is long in Hebrew year
+ * @private
  * @param {number} year Hebrew year
  * @return {boolean}
  */
@@ -889,6 +885,7 @@ function longCheshvan(year) {
 }
 /**
  * true if Kislev is short in Hebrew year
+ * @private
  * @param {number} year Hebrew year
  * @return {boolean}
  */
@@ -998,19 +995,22 @@ class HDate {
        * @type {number}
        */
 
-      this.year = +year;
+      year = parseInt(year, 10);
 
-      if (isNaN(this.year)) {
+      if (isNaN(year)) {
         throw new TypeError(`HDate called with bad year argument: ${year}`);
       }
 
+      this.year = year;
       this.setMonth(month); // will throw if we can't parse
 
-      this.setDate(+day);
+      day = parseInt(day, 10);
 
-      if (isNaN(this.day)) {
+      if (isNaN(day)) {
         throw new TypeError(`HDate called with bad day argument: ${day}`);
       }
+
+      this.setDate(day);
     } else {
       // 0 arguments
       if (typeof day === 'undefined') {
@@ -1018,7 +1018,7 @@ class HDate {
       } // 1 argument
 
 
-      const abs0 = typeof day === 'number' && !isNaN(day) ? day : greg.isDate(day) ? greg.greg2abs(day) : HDate.isHDate(day) ? {
+      const abs0 = typeof day === 'number' && !isNaN(day) ? day : isDate(day) ? greg2abs(day) : HDate.isHDate(day) ? {
         dd: day.day,
         mm: day.month,
         yy: day.year
@@ -1163,7 +1163,7 @@ class HDate {
 
 
   greg() {
-    return greg.abs2greg(this.abs());
+    return abs2greg(this.abs());
   }
   /**
    * Returns R.D. (Rata Die) fixed days.
@@ -1562,7 +1562,15 @@ class HDate {
 
 
   static monthNum(month) {
-    return typeof month === 'number' ? month : month.charCodeAt(0) >= 48 && month.charCodeAt(0) <= 57 ?
+    if (typeof month === 'number') {
+      if (isNaN(month) || month > 14) {
+        throw new RangeError(`Invalid month number: ${month}`);
+      }
+
+      return month;
+    }
+
+    return month.charCodeAt(0) >= 48 && month.charCodeAt(0) <= 57 ?
     /* number */
     parseInt(month, 10) : HDate.monthFromName(month);
   }
@@ -1604,7 +1612,14 @@ class HDate {
 
 
   static monthFromName(monthName) {
-    if (typeof monthName === 'number') return monthName;
+    if (typeof monthName === 'number') {
+      if (isNaN(monthName) || monthName < 1 || monthName > 14) {
+        throw new RangeError(`Invalid month name: ${monthName}`);
+      }
+
+      return monthName;
+    }
+
     const c = monthName.toLowerCase();
     /*
     the Hebrew months are unique to their second letter
@@ -1836,31 +1851,6 @@ function onOrBefore(day, t, offset) {
   return new HDate(HDate.dayOnOrBefore(day, t.abs() + offset));
 }
 
-const CHAG$1 = 0x000001;
-const LIGHT_CANDLES$2 = 0x000002;
-const YOM_TOV_ENDS$2 = 0x000004;
-const CHUL_ONLY$2 = 0x000008; // chutz l'aretz (Diaspora)
-
-const IL_ONLY$2 = 0x000010; // b'aretz (Israel)
-
-const LIGHT_CANDLES_TZEIS$2 = 0x000020;
-const CHANUKAH_CANDLES$2 = 0x000040;
-const ROSH_CHODESH$1 = 0x000080;
-const MINOR_FAST$2 = 0x000100;
-const SPECIAL_SHABBAT$2 = 0x000200;
-const PARSHA_HASHAVUA$1 = 0x000400;
-const DAF_YOMI$1 = 0x000800;
-const OMER_COUNT$1 = 0x001000;
-const MODERN_HOLIDAY$2 = 0x002000;
-const MAJOR_FAST$2 = 0x004000;
-const SHABBAT_MEVARCHIM$1 = 0x008000;
-const MOLAD = 0x010000;
-const USER_EVENT = 0x020000;
-const HEBREW_DATE = 0x040000;
-const MINOR_HOLIDAY$2 = 0x080000;
-const EREV$2 = 0x100000;
-const CHOL_HAMOED$2 = 0x200000;
-const MISHNA_YOMI = 0x400000;
 /**
  * Holiday flags for Event
  * @readonly
@@ -1869,73 +1859,73 @@ const MISHNA_YOMI = 0x400000;
 
 const flags = {
   /** Chag, yontiff, yom tov */
-  CHAG: CHAG$1,
+  CHAG: 0x000001,
 
   /** Light candles 18 minutes before sundown */
-  LIGHT_CANDLES: LIGHT_CANDLES$2,
+  LIGHT_CANDLES: 0x000002,
 
   /** End of holiday (end of Yom Tov)  */
-  YOM_TOV_ENDS: YOM_TOV_ENDS$2,
+  YOM_TOV_ENDS: 0x000004,
 
   /** Observed only in the Diaspora (chutz l'aretz)  */
-  CHUL_ONLY: CHUL_ONLY$2,
+  CHUL_ONLY: 0x000008,
 
   /** Observed only in Israel */
-  IL_ONLY: IL_ONLY$2,
+  IL_ONLY: 0x000010,
 
   /** Light candles in the evening at Tzeit time (3 small stars) */
-  LIGHT_CANDLES_TZEIS: LIGHT_CANDLES_TZEIS$2,
+  LIGHT_CANDLES_TZEIS: 0x000020,
 
   /** Candle-lighting for Chanukah */
-  CHANUKAH_CANDLES: CHANUKAH_CANDLES$2,
+  CHANUKAH_CANDLES: 0x000040,
 
   /** Rosh Chodesh, beginning of a new Hebrew month */
-  ROSH_CHODESH: ROSH_CHODESH$1,
+  ROSH_CHODESH: 0x000080,
 
   /** Minor fasts like Tzom Tammuz, Ta'anit Esther, ... */
-  MINOR_FAST: MINOR_FAST$2,
+  MINOR_FAST: 0x000100,
 
   /** Shabbat Shekalim, Zachor, ... */
-  SPECIAL_SHABBAT: SPECIAL_SHABBAT$2,
+  SPECIAL_SHABBAT: 0x000200,
 
   /** Weekly sedrot on Saturdays */
-  PARSHA_HASHAVUA: PARSHA_HASHAVUA$1,
+  PARSHA_HASHAVUA: 0x000400,
 
   /** Daily page of Talmud */
-  DAF_YOMI: DAF_YOMI$1,
+  DAF_YOMI: 0x000800,
 
   /** Days of the Omer */
-  OMER_COUNT: OMER_COUNT$1,
+  OMER_COUNT: 0x001000,
 
   /** Yom HaShoah, Yom HaAtzma'ut, ... */
-  MODERN_HOLIDAY: MODERN_HOLIDAY$2,
+  MODERN_HOLIDAY: 0x002000,
 
   /** Yom Kippur and Tish'a B'Av */
-  MAJOR_FAST: MAJOR_FAST$2,
+  MAJOR_FAST: 0x004000,
 
   /** On the Saturday before Rosh Chodesh */
-  SHABBAT_MEVARCHIM: SHABBAT_MEVARCHIM$1,
+  SHABBAT_MEVARCHIM: 0x008000,
 
   /** Molad */
-  MOLAD,
+  MOLAD: 0x010000,
 
   /** Yahrzeit or Hebrew Anniversary */
-  USER_EVENT,
+  USER_EVENT: 0x020000,
 
   /** Daily Hebrew date ("11th of Sivan, 5780") */
-  HEBREW_DATE,
+  HEBREW_DATE: 0x040000,
 
   /** A holiday that's not major, modern, rosh chodesh, or a fast day */
-  MINOR_HOLIDAY: MINOR_HOLIDAY$2,
+  MINOR_HOLIDAY: 0x080000,
 
   /** Evening before a major or minor holiday */
-  EREV: EREV$2,
+  EREV: 0x100000,
 
   /** Chol haMoed, intermediate days of Pesach or Sukkot */
-  CHOL_HAMOED: CHOL_HAMOED$2,
+  CHOL_HAMOED: 0x200000,
 
   /** Mishna Yomi */
-  MISHNA_YOMI
+  MISHNA_YOMI: 0x400000
 };
 /** Represents an Event with a title, date, and flags */
 
@@ -2053,7 +2043,7 @@ class Event {
 
 
   observedInIsrael() {
-    return !(this.mask & CHUL_ONLY$2);
+    return !(this.mask & flags.CHUL_ONLY);
   }
   /**
    * Is this event observed in the Diaspora?
@@ -2067,7 +2057,24 @@ class Event {
 
 
   observedInDiaspora() {
-    return !(this.mask & IL_ONLY$2);
+    return !(this.mask & flags.IL_ONLY);
+  }
+  /**
+   * Is this event observed in Israel/Diaspora?
+   * @example
+   * const ev1 = new Event(new HDate(7, 'Sivan', 5749), 'Shavuot II', flags.CHAG | flags.CHUL_ONLY);
+   * ev1.observedIn(false); // true
+   * ev1.observedIn(true); // false
+   * const ev2 = new Event(new HDate(26, 'Kislev', 5749), 'Chanukah: 3 Candles', 0);
+   * ev2.observedIn(false); // true
+   * ev2.observedIn(true); // true
+   * @param {boolean} il
+   * @return {boolean}
+   */
+
+
+  observedIn(il) {
+    return il ? this.observedInIsrael() : this.observedInDiaspora();
   }
   /**
    * @deprecated
@@ -2618,7 +2625,7 @@ class Zmanim {
       throw new RangeError(`Longitude ${longitude} out of range [-180,180]`);
     }
 
-    const dt = greg.isDate(date) ? date : HDate.isHDate(date) ? date.greg() : throwTypeError$2(`invalid date: ${date}`);
+    const dt = isDate(date) ? date : HDate.isHDate(date) ? date.greg() : throwTypeError$2(`invalid date: ${date}`);
     this.date = dt;
     this.solarCalc = new SolarCalc(this.date, latitude, longitude);
     this.sun = this.solarCalc.sun;
@@ -3983,8 +3990,8 @@ function getTodayIsHe(omer) {
 
 /* eslint-disable no-multi-spaces */
 const osdate = new Date(1923, 8, 11);
-const osday = greg.greg2abs(osdate);
-const nsday = greg.greg2abs(new Date(1975, 5, 24));
+const osday = greg2abs(osdate);
+const nsday = greg2abs(new Date(1975, 5, 24));
 const shas = [['Berachot', 64], ['Shabbat', 157], ['Eruvin', 105], ['Pesachim', 121], ['Shekalim', 22], ['Yoma', 88], ['Sukkah', 56], ['Beitzah', 40], ['Rosh Hashana', 35], ['Taanit', 31], ['Megillah', 32], ['Moed Katan', 29], ['Chagigah', 27], ['Yevamot', 122], ['Ketubot', 112], ['Nedarim', 91], ['Nazir', 66], ['Sotah', 49], ['Gitin', 90], ['Kiddushin', 82], ['Baba Kamma', 119], ['Baba Metzia', 119], ['Baba Batra', 176], ['Sanhedrin', 113], ['Makkot', 24], ['Shevuot', 49], ['Avodah Zarah', 76], ['Horayot', 14], ['Zevachim', 120], ['Menachot', 110], ['Chullin', 142], ['Bechorot', 61], ['Arachin', 34], ['Temurah', 34], ['Keritot', 28], ['Meilah', 22], ['Kinnim', 4], ['Tamid', 9], ['Midot', 5], ['Niddah', 73]].map(m => {
   return {
     name: m[0],
@@ -4006,7 +4013,7 @@ class DafYomi {
    * @param {Date|HDate|number} gregdate Gregorian date
    */
   constructor(gregdate) {
-    const cday = typeof gregdate === 'number' && !isNaN(gregdate) ? gregdate : greg.isDate(gregdate) ? greg.greg2abs(gregdate) : HDate.isHDate(gregdate) ? gregdate.abs() : throwTypeError$1(`non-date given to dafyomi: ${gregdate}`);
+    const cday = typeof gregdate === 'number' && !isNaN(gregdate) ? gregdate : isDate(gregdate) ? greg2abs(gregdate) : HDate.isHDate(gregdate) ? gregdate.abs() : throwTypeError$1(`non-date given to dafyomi: ${gregdate}`);
 
     if (cday < osday) {
       throw new RangeError(`Date ${gregdate} too early; Daf Yomi cycle began on ${osdate}`);
@@ -5261,7 +5268,7 @@ function getHolidaysForYear_(year) {
 var mishnayot = [{k:"Berakhot",v:[5,8,6,7,5,8,5,8,5]},{k:"Peah",v:[6,8,8,11,8,11,8,9]},{k:"Demai",v:[4,5,6,7,11,12,8]},{k:"Kilayim",v:[9,11,7,9,8,9,8,6,10]},{k:"Sheviit",v:[8,10,10,10,9,6,7,11,9,9]},{k:"Terumot",v:[10,6,9,13,9,6,7,12,7,12,10]},{k:"Maasrot",v:[8,8,10,6,8]},{k:"Maaser Sheni",v:[7,10,13,12,15]},{k:"Challah",v:[9,8,10,11]},{k:"Orlah",v:[9,17,9]},{k:"Bikkurim",v:[11,11,12,5]},{k:"Shabbat",v:[11,7,6,2,4,10,4,7,7,6,6,6,7,4,3,8,8,3,6,5,3,6,5,5]},{k:"Eruvin",v:[10,6,9,11,9,10,11,11,4,15]},{k:"Pesachim",v:[7,8,8,9,10,6,13,8,11,9]},{k:"Shekalim",v:[7,5,4,9,6,6,7,8]},{k:"Yoma",v:[8,7,11,6,7,8,5,9]},{k:"Sukkah",v:[11,9,15,10,8]},{k:"Beitzah",v:[10,10,8,7,7]},{k:"Rosh Hashanah",v:[9,9,8,9]},{k:"Taanit",v:[7,10,9,8]},{k:"Megillah",v:[11,6,6,10]},{k:"Moed Katan",v:[10,5,9]},{k:"Chagigah",v:[8,7,8]},{k:"Yevamot",v:[4,10,10,13,6,6,6,6,6,9,7,6,13,9,10,7]},{k:"Ketubot",v:[10,10,9,12,9,7,10,8,9,6,6,4,11]},{k:"Nedarim",v:[4,5,11,8,6,10,9,7,10,8,12]},{k:"Nazir",v:[7,10,7,7,7,11,4,2,5]},{k:"Sotah",v:[9,6,8,5,5,4,8,7,15]},{k:"Gittin",v:[6,7,8,9,9,7,9,10,10]},{k:"Kiddushin",v:[10,10,13,14]},{k:"Bava Kamma",v:[4,6,11,9,7,6,7,7,12,10]},{k:"Bava Metzia",v:[8,11,12,12,11,8,11,9,13,6]},{k:"Bava Batra",v:[6,14,8,9,11,8,4,8,10,8]},{k:"Sanhedrin",v:[6,5,8,5,5,6,11,7,6,6,6]},{k:"Makkot",v:[10,8,16]},{k:"Shevuot",v:[7,5,11,13,5,7,8,6]},{k:"Eduyot",v:[14,10,12,12,7,3,9,7]},{k:"Avodah Zarah",v:[9,7,10,12,12]},{k:"Avot",v:[18,16,18,22,23,11]},{k:"Horayot",v:[5,7,8]},{k:"Zevachim",v:[4,5,6,6,8,7,6,12,7,8,8,6,8,10]},{k:"Menachot",v:[4,5,7,5,9,7,6,7,9,9,9,5,11]},{k:"Chullin",v:[7,10,7,7,5,7,6,6,8,4,2,5]},{k:"Bekhorot",v:[7,9,4,10,6,12,7,10,8]},{k:"Arakhin",v:[4,6,5,4,6,5,5,7,8]},{k:"Temurah",v:[6,3,5,4,6,5,6]},{k:"Keritot",v:[7,6,10,3,8,9]},{k:"Meilah",v:[4,9,8,6,5,6]},{k:"Tamid",v:[4,5,9,3,6,3,4]},{k:"Middot",v:[9,6,8,7,4]},{k:"Kinnim",v:[4,5,6]},{k:"Kelim",v:[9,8,8,4,11,4,6,11,8,8,9,8,8,8,6,8,17,9,10,7,3,10,5,17,9,9,12,10,8,4]},{k:"Oholot",v:[8,7,7,3,7,7,6,6,16,7,9,8,6,7,10,5,5,10]},{k:"Negaim",v:[6,5,8,11,5,8,5,10,3,10,12,7,12,13]},{k:"Parah",v:[4,5,11,4,9,5,12,11,9,6,9,11]},{k:"Tahorot",v:[9,8,8,13,9,10,9,9,9,8]},{k:"Mikvaot",v:[8,10,4,5,6,11,7,5,7,8]},{k:"Niddah",v:[7,7,7,7,9,14,5,4,11,8]},{k:"Makhshirin",v:[6,11,8,10,11,8]},{k:"Zavim",v:[6,4,3,7,12]},{k:"Tevul Yom",v:[5,8,6,7]},{k:"Yadayim",v:[5,4,5,8]},{k:"Oktzin",v:[6,10,12]}];
 
 const cycleStartDate = new Date(1947, 4, 20);
-const mishnaYomiStart = greg.greg2abs(cycleStartDate);
+const mishnaYomiStart = greg2abs(cycleStartDate);
 const numMishnayot = 4192;
 const numDays = numMishnayot / 2;
 /**
@@ -5323,7 +5330,7 @@ class MishnaYomiIndex {
 
 
   lookup(date) {
-    const abs = typeof date === 'number' && !isNaN(date) ? date : greg.isDate(date) ? greg.greg2abs(date) : HDate.isHDate(date) ? date.abs() : throwTypeError(`Invalid date: ${date}`);
+    const abs = typeof date === 'number' && !isNaN(date) ? date : isDate(date) ? greg2abs(date) : HDate.isHDate(date) ? date.abs() : throwTypeError(`Invalid date: ${date}`);
 
     if (abs < mishnaYomiStart) {
       const s = date.toISOString().substring(0, 10);
@@ -5510,7 +5517,7 @@ function getBirthdayOrAnniversary_(hyear, gdate) {
   return new HDate(day, month, hyear);
 }
 
-const version="3.38.0";
+const version="3.39.0";
 
 const headers$1={"plural-forms":"nplurals=2; plural=(n > 1);",language:"en_CA@ashkenazi"};const 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};
 
@@ -5731,7 +5738,7 @@ function checkCandleOptions(options) {
 
 function getAbs(d) {
   if (typeof d == 'number') return d;
-  if (greg.isDate(d)) return greg.greg2abs(d);
+  if (isDate(d)) return greg2abs(d);
   if (HDate.isHDate(d)) return d.abs();
   throw new TypeError(`Invalid date type: ${d}`);
 }
@@ -5793,11 +5800,11 @@ function getStartAndEnd(options) {
       startGreg.setFullYear(theYear);
     }
 
-    const startAbs = greg.greg2abs(startGreg);
+    const startAbs = greg2abs(startGreg);
     let endAbs;
 
     if (options.month) {
-      endAbs = startAbs + greg.daysInMonth(theMonth, theYear) - 1;
+      endAbs = startAbs + daysInMonth$1(theMonth, theYear) - 1;
     } else {
       const endYear = theYear + numYears;
       const endGreg = new Date(endYear, 0, 1);
@@ -5806,7 +5813,7 @@ function getStartAndEnd(options) {
         endGreg.setFullYear(endYear);
       }
 
-      endAbs = greg.greg2abs(endGreg) - 1;
+      endAbs = greg2abs(endGreg) - 1;
     }
 
     return [startAbs, endAbs];
@@ -6071,7 +6078,7 @@ class HebrewCalendar {
     warnUnrecognizedOptions(options);
     const startAbs = startAndEnd[0];
     const endAbs = startAndEnd[1];
-    const startGreg = greg.abs2greg(startAbs);
+    const startGreg = abs2greg(startAbs);
 
     if (startGreg.getFullYear() < 100) {
       options.candlelighting = false;
@@ -6089,7 +6096,7 @@ class HebrewCalendar {
 
       if (hyear != currentYear) {
         currentYear = hyear;
-        holidaysYear = HebrewCalendar.getHolidaysForYear(currentYear);
+        holidaysYear = getHolidaysForYear_(currentYear);
 
         if (options.sedrot && currentYear >= 3762) {
           sedra = getSedra_(currentYear, il);
@@ -6373,14 +6380,26 @@ class HebrewCalendar {
  */
 
 function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
-  const eFlags = ev.getFlags();
   const il = options.il;
-  const observed = il && ev.observedInIsrael() || !il && ev.observedInDiaspora();
-  const mask = options.mask;
 
-  if (observed && (eFlags & mask || !eFlags && !options.userMask)) {
-    const location = options.location;
+  if (!ev.observedIn(il)) {
+    return candlesEv; // holiday isn't observed here; bail out early
+  }
+
+  const eFlags = ev.getFlags();
+  const location = options.location;
+  const isMajorFast = Boolean(eFlags & MAJOR_FAST);
+  const isMinorFast = Boolean(eFlags & MINOR_FAST);
+
+  if (options.candlelighting && (isMajorFast || isMinorFast)) {
+    ev = makeFastStartEnd(ev, location);
 
+    if (ev.startEvent && (isMajorFast || isMinorFast && !options.noMinorFast)) {
+      events.push(ev.startEvent);
+    }
+  }
+
+  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);
@@ -6402,22 +6421,14 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
     }
 
     if (!options.noHolidays) {
-      if (options.candlelighting && eFlags & (MINOR_FAST | MAJOR_FAST)) {
-        ev = makeFastStartEnd(ev, location);
-      }
-
-      if (ev.startEvent) {
-        events.push(ev.startEvent);
-      }
-
       events.push(ev); // the original event itself
-
-      if (ev.endEvent) {
-        events.push(ev.endEvent);
-      }
     }
   }
 
+  if (ev.endEvent && (isMajorFast || isMinorFast && !options.noMinorFast)) {
+    events.push(ev.endEvent);
+  }
+
   return candlesEv;
 }
 

package/hebcal.d.ts

@@ -27,6 +27,7 @@ declare module '@hebcal/core' {
         getEmoji(): string;
         observedInIsrael(): boolean;
         observedInDiaspora(): boolean;
+        observedIn(il: boolean): boolean;
         clone(): Event;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/core",
-  "version": "3.38.0",
+  "version": "3.39.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "contributors": [
     "Eyal Schachter (https://github.com/Scimonster)",
@@ -47,7 +47,7 @@
     "pretest": "npm run build",
     "typedef": "npx jsdoc -t node_modules/tsd-jsdoc/dist -r ./src/",
     "lint": "eslint src",
-    "coverage-local": "nyc --concurrency 2",
+    "coverage-local": "nyc --concurrency 2 ava",
     "coverage": "nyc --reporter=lcov ava --concurrency 4 && codecov",
     "test": "ava --concurrency 4"
   },
@@ -63,25 +63,25 @@
     "verbose": true
   },
   "devDependencies": {
-    "@babel/core": "^7.17.10",
-    "@babel/preset-env": "^7.17.10",
+    "@babel/core": "^7.18.5",
+    "@babel/preset-env": "^7.18.2",
     "@babel/register": "^7.17.7",
     "@hebcal/solar-calc": "^1.1.2",
     "@rollup/plugin-babel": "^5.3.1",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
-    "ava": "^4.2.0",
+    "ava": "^4.3.0",
     "codecov": "^3.8.3",
-    "core-js": "^3.22.5",
-    "eslint": "^8.15.0",
+    "core-js": "^3.23.1",
+    "eslint": "^8.17.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^3.6.10",
     "jsdoc-to-markdown": "^7.1.1",
     "nyc": "^15.1.0",
-    "rollup": "^2.72.1",
+    "rollup": "^2.75.6",
     "rollup-plugin-terser": "^7.0.2",
     "tsd-jsdoc": "^2.5.0",
-    "ttag-cli": "^1.9.3"
+    "ttag-cli": "^1.9.4"
   }
 }