@hebcal/core 3.38.2 → 3.39.2

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/core v3.38.2 */
+/*! @hebcal/core v3.39.2 */
 /*
  * More minimal greg routines
  */
@@ -2059,6 +2059,23 @@ class Event {
   observedInDiaspora() {
     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
    * Optional additional event attributes (e.g. `eventTimeStr`, `cholHaMoedDay`)
@@ -5500,7 +5517,7 @@ function getBirthdayOrAnniversary_(hyear, gdate) {
   return new HDate(day, month, hyear);
 }
 
-const version="3.38.2";
+const version="3.39.2";
 
 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};
 
@@ -5516,17 +5533,13 @@ const heNoNikud = {};
 Object.keys(heStrs).forEach(key => {
   heNoNikud[key] = [Locale.hebrewStripNikkud(heStrs[key][0])];
 });
-const localeName = 'he-x-NoNikud';
 const poHeNoNikud = {
-  headers: {
-    'plural-forms': 'nplurals=2; plural=(n!=1);',
-    'language': localeName
-  },
+  headers: poHe.headers,
   contexts: {
     '': heNoNikud
   }
 };
-Locale.addLocale(localeName, poHeNoNikud);
+Locale.addLocale('he-x-NoNikud', poHeNoNikud);
 
 /*
     Hebcal - A Jewish Calendar Generator
@@ -5833,7 +5846,7 @@ function getMaskFromOptions(options) {
   }
 
   if (options.candlelighting) {
-    mask |= LIGHT_CANDLES | LIGHT_CANDLES_TZEIS;
+    mask |= LIGHT_CANDLES | LIGHT_CANDLES_TZEIS | YOM_TOV_ENDS;
   } // suppression of defaults
 
 
@@ -6079,7 +6092,7 @@ class HebrewCalendar {
 
       if (hyear != currentYear) {
         currentYear = hyear;
-        holidaysYear = HebrewCalendar.getHolidaysForYear(currentYear);
+        holidaysYear = getHolidaysForYear_(currentYear);
 
         if (options.sedrot && currentYear >= 3762) {
           sedra = getSedra_(currentYear, il);
@@ -6363,14 +6376,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);
@@ -6392,22 +6417,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.2",
+  "version": "3.39.2",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "contributors": [
     "Eyal Schachter (https://github.com/Scimonster)",
@@ -74,7 +74,7 @@
     "ava": "^4.3.0",
     "codecov": "^3.8.3",
     "core-js": "^3.23.1",
-    "eslint": "^8.17.0",
+    "eslint": "^8.18.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^3.6.10",
     "jsdoc-to-markdown": "^7.1.1",