@hebcal/core 3.38.2 → 3.39.2

package/README.md

@@ -890,6 +890,7 @@ Represents an Event with a title, date, and flags
     * [.url()](#Event+url) ⇒ <code>string</code>
     * [.observedInIsrael()](#Event+observedInIsrael) ⇒ <code>boolean</code>
     * [.observedInDiaspora()](#Event+observedInDiaspora) ⇒ <code>boolean</code>
+    * [.observedIn(il)](#Event+observedIn) ⇒ <code>boolean</code>
     * ~~[.getAttrs()](#Event+getAttrs) ⇒ <code>Object</code>~~
     * [.clone()](#Event+clone) ⇒ [<code>Event</code>](#Event)
 
@@ -1003,6 +1004,26 @@ ev1.observedInDiaspora(); // true
 const ev2 = new Event(new HDate(26, 'Kislev', 5749), 'Chanukah: 3 Candles', 0);
 ev2.observedInDiaspora(); // true
 ```
+<a name="Event+observedIn"></a>
+
+### event.observedIn(il) ⇒ <code>boolean</code>
+Is this event observed in Israel/Diaspora?
+
+**Kind**: instance method of [<code>Event</code>](#Event)  
+
+| Param | Type |
+| --- | --- |
+| il | <code>boolean</code> | 
+
+**Example**  
+```js
+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
+```
 <a name="Event+getAttrs"></a>
 
 ### ~~event.getAttrs() ⇒ <code>Object</code>~~

package/dist/bundle.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v3.38.2 */
+/*! @hebcal/core v3.39.2 */
 var hebcal = (function (exports) {
 'use strict';
 
@@ -3704,6 +3704,24 @@ var Event = /*#__PURE__*/function () {
     value: function 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}
+     */
+
+  }, {
+    key: "observedIn",
+    value: function observedIn(il) {
+      return il ? this.observedInIsrael() : this.observedInDiaspora();
+    }
     /**
      * @deprecated
      * Optional additional event attributes (e.g. `eventTimeStr`, `cholHaMoedDay`)
@@ -7744,7 +7762,7 @@ function getBirthdayOrAnniversary_(hyear, gdate) {
   return new HDate(day, month, hyear);
 }
 
-var version="3.38.2";
+var version="3.39.2";
 
 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};
 
@@ -7760,17 +7778,13 @@ var heNoNikud = {};
 Object.keys(heStrs).forEach(function (key) {
   heNoNikud[key] = [Locale.hebrewStripNikkud(heStrs[key][0])];
 });
-var localeName = 'he-x-NoNikud';
 var 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);
 
 var FRI = 5;
 var SAT = 6;
@@ -8060,7 +8074,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
 
 
@@ -8314,7 +8328,7 @@ var HebrewCalendar = /*#__PURE__*/function () {
 
         if (hyear != currentYear) {
           currentYear = hyear;
-          holidaysYear = HebrewCalendar.getHolidaysForYear(currentYear);
+          holidaysYear = getHolidaysForYear_(currentYear);
 
           if (options.sedrot && currentYear >= 3762) {
             sedra = getSedra_(currentYear, il);
@@ -8612,14 +8626,26 @@ var HebrewCalendar = /*#__PURE__*/function () {
  */
 
 function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
-  var eFlags = ev.getFlags();
   var il = options.il;
-  var observed = il && ev.observedInIsrael() || !il && ev.observedInDiaspora();
-  var mask = options.mask;
 
-  if (observed && (eFlags & mask || !eFlags && !options.userMask)) {
-    var location = options.location;
+  if (!ev.observedIn(il)) {
+    return candlesEv; // holiday isn't observed here; bail out early
+  }
+
+  var eFlags = ev.getFlags();
+  var location = options.location;
+  var isMajorFast = Boolean(eFlags & MAJOR_FAST);
+  var 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) {
       var hd = ev.getDate();
       candlesEv = makeCandleEvent(ev, hd, dow, location, options);
@@ -8641,22 +8667,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;
 }