@hebcal/core 5.0.0 → 5.0.1

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.0.0 */
+/*! @hebcal/core v5.0.1 */
 'use strict';
 
 const GERESH = '׳';
@@ -28,10 +28,9 @@ const heb2num = {
   'ת': 400
 };
 const num2heb = new Map();
-Object.keys(heb2num).forEach(key => {
-  const val = heb2num[key];
+for (const [key, val] of Object.entries(heb2num)) {
   num2heb.set(val, key);
-});
+}
 
 /**
  * @private
@@ -251,9 +250,7 @@ class Locale {
       throw new TypeError(`Locale '${locale}' invalid compact format`);
     }
     const ctx = data.contexts[''];
-    Object.keys(ctx).forEach(id => {
-      loc[id] = ctx[id];
-    });
+    Object.assign(loc, ctx);
   }
   /**
    * Activates a locale. Throws an error if the locale has not been previously added.
@@ -1837,7 +1834,7 @@ class Event {
     this.desc = desc;
     this.mask = +mask;
     if (typeof attrs === 'object' && attrs !== null) {
-      Object.keys(attrs).forEach(k => this[k] = attrs[k]);
+      Object.assign(this, attrs);
     }
   }
   /**
@@ -3430,10 +3427,10 @@ class Location extends GeoLocation {
     return true;
   }
 }
-classicCities0.forEach(city => {
+for (const city of classicCities0) {
   const location = new Location(city[2], city[3], city[1] == 'IL', city[4], city[0], city[1], undefined, city[5]);
   Location.addLocation(location.getName(), location);
-});
+}
 
 const _formatters = new Map();
 
@@ -5612,40 +5609,7 @@ const MINOR_HOLIDAY$1 = flags.MINOR_HOLIDAY;
 const EREV$1 = flags.EREV;
 // const CHOL_HAMOED = flags.CHOL_HAMOED;
 
-/**
- * Avoid dependency on ES6 Map object
- * @private
- */
-class SimpleMap {
-  /**
-   * @param {string} key
-   * @return {boolean}
-   */
-  has(key) {
-    return typeof this[key] !== 'undefined';
-  }
-  /**
-   * @param {string} key
-   * @return {any}
-   */
-  get(key) {
-    return this[key];
-  }
-  /**
-   * @param {string} key
-   * @param {any} val
-   */
-  set(key, val) {
-    this[key] = val;
-  }
-  /**
-   * @return {string[]}
-   */
-  keys() {
-    return Object.keys(this);
-  }
-}
-const sedraCache = new SimpleMap();
+const sedraCache = new Map();
 
 /**
  * @private
@@ -5689,13 +5653,12 @@ function getHolidaysForYear_(year) {
   }
   const RH = new HDate(1, TISHREI$1, year);
   const pesach = new HDate(15, NISAN$1, year);
-  const h = new SimpleMap();
+  const map = new Map();
   // eslint-disable-next-line require-jsdoc
   function add(...events) {
-    // for (const ev of events) {
-    events.forEach(ev => {
+    for (const ev of events) {
       const key = ev.date.toString();
-      const arr = h.get(key);
+      const arr = map.get(key);
       if (typeof arr === 'object') {
         if (arr[0].getFlags() & flags.EREV) {
           arr.unshift(ev);
@@ -5703,17 +5666,17 @@ function getHolidaysForYear_(year) {
           arr.push(ev);
         }
       } else {
-        h.set(key, [ev]);
+        map.set(key, [ev]);
       }
-    });
+    }
   }
-  staticHolidays.forEach(h => {
+  for (const h of staticHolidays) {
     const hd = new HDate(h.dd, h.mm, year);
     const ev = new HolidayEvent(hd, h.desc, h.flags);
     if (h.emoji) ev.emoji = h.emoji;
     if (h.chmDay) ev.cholHaMoedDay = h.chmDay;
     add(ev);
-  });
+  }
 
   // standard holidays that don't shift based on year
   add(new RoshHashanaEvent(RH, year, CHAG | LIGHT_CANDLES_TZEIS$1));
@@ -5765,7 +5728,7 @@ function getHolidaysForYear_(year) {
   if (yomHaZikaronDt) {
     add(new HolidayEvent(yomHaZikaronDt, 'Yom HaZikaron', MODERN_HOLIDAY$1, emojiIsraelFlag), new HolidayEvent(yomHaZikaronDt.next(), 'Yom HaAtzma\'ut', MODERN_HOLIDAY$1, emojiIsraelFlag));
   }
-  staticModernHolidays.forEach(h => {
+  for (const h of staticModernHolidays) {
     if (year >= h.firstYear) {
       let hd = new HDate(h.dd, h.mm, year);
       const dow = hd.getDay();
@@ -5783,7 +5746,7 @@ function getHolidaysForYear_(year) {
       }
       add(ev);
     }
-  });
+  }
   let tamuz17 = new HDate(17, TAMUZ, year);
   let tamuz17attrs;
   if (tamuz17.getDay() == SAT$1) {
@@ -5854,8 +5817,8 @@ function getHolidaysForYear_(year) {
       emoji: '☀️'
     }));
   }
-  yearCache.set(year, h);
-  return h;
+  yearCache.set(year, map);
+  return map;
 }
 
 /**
@@ -5922,7 +5885,7 @@ class DailyLearning {
   }
 }
 
-const version="5.0.0";
+const version="5.0.1";
 
 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};
 
@@ -5935,9 +5898,9 @@ Locale.addLocale('he', poHe);
 Locale.addLocale('h', poHe);
 const heStrs = poHe.contexts[''];
 const heNoNikud = {};
-Object.keys(heStrs).forEach(key => {
-  heNoNikud[key] = [Locale.hebrewStripNikkud(heStrs[key][0])];
-});
+for (const [key, val] of Object.entries(heStrs)) {
+  heNoNikud[key] = [Locale.hebrewStripNikkud(val[0])];
+}
 const poHeNoNikud = {
   headers: poHe.headers,
   contexts: {
@@ -6218,24 +6181,12 @@ const RECOGNIZED_OPTIONS = {
  * @param {CalOptions} options
  */
 function warnUnrecognizedOptions(options) {
-  Object.keys(options).forEach(k => {
+  for (const k of Object.keys(options)) {
     if (typeof RECOGNIZED_OPTIONS[k] === 'undefined' && !unrecognizedAlreadyWarned.has(k)) {
       console.warn(`Ignoring unrecognized HebrewCalendar option: ${k}`);
       unrecognizedAlreadyWarned.add(k);
     }
-  });
-}
-
-/**
- * A bit like Object.assign(), but just a shallow copy
- * @private
- * @param {any} target
- * @param {any} source
- * @return {any}
- */
-function shallowCopy(target, source) {
-  Object.keys(source).forEach(k => target[k] = source[k]);
-  return target;
+  }
 }
 const israelCityOffset = {
   'Jerusalem': 40,
@@ -6713,7 +6664,7 @@ class HebrewCalendar {
    * @return {Event[]}
    */
   static calendar(options = {}) {
-    options = shallowCopy({}, options); // so we can modify freely
+    options = Object.assign({}, options); // so we can modify freely
     checkCandleOptions(options);
     const location = options.location = options.location || defaultLocation;
     const il = options.il = options.il || location.il || false;
@@ -6762,9 +6713,9 @@ class HebrewCalendar {
       const dow = hd.getDay();
       let candlesEv;
       const ev = holidaysYear.get(hd.toString()) || [];
-      ev.forEach(e => {
+      for (const e of ev) {
         candlesEv = appendHolidayAndRelated(evts, e, options, candlesEv, dow);
-      });
+      }
       if (options.sedrot && dow === SAT) {
         const parsha0 = sedra.lookup(abs);
         if (!parsha0.chag) {
@@ -6773,8 +6724,7 @@ class HebrewCalendar {
       }
       const dailyLearning = options.dailyLearning;
       if (typeof dailyLearning === 'object') {
-        Object.keys(dailyLearning).forEach(key => {
-          const val = dailyLearning[key];
+        for (const [key, val] of Object.entries(dailyLearning)) {
           if (val) {
             const name = key === 'yerushalmi' ? val === 2 ? 'yerushalmi-schottenstein' : 'yerushalmi-vilna' : key;
             const learningEv = DailyLearning.lookup(name, hd);
@@ -6782,7 +6732,7 @@ class HebrewCalendar {
               evts.push(learningEv);
             }
           }
-        });
+        }
       }
       if (options.omer && abs >= beginOmer && abs <= endOmer) {
         const omer = abs - beginOmer + 1;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/core v5.0.0 */
+/*! @hebcal/core v5.0.1 */
 const GERESH = '׳';
 const GERSHAYIM = '״';
 const heb2num = {
@@ -26,10 +26,9 @@ const heb2num = {
   'ת': 400
 };
 const num2heb = new Map();
-Object.keys(heb2num).forEach(key => {
-  const val = heb2num[key];
+for (const [key, val] of Object.entries(heb2num)) {
   num2heb.set(val, key);
-});
+}
 
 /**
  * @private
@@ -249,9 +248,7 @@ class Locale {
       throw new TypeError(`Locale '${locale}' invalid compact format`);
     }
     const ctx = data.contexts[''];
-    Object.keys(ctx).forEach(id => {
-      loc[id] = ctx[id];
-    });
+    Object.assign(loc, ctx);
   }
   /**
    * Activates a locale. Throws an error if the locale has not been previously added.
@@ -1835,7 +1832,7 @@ class Event {
     this.desc = desc;
     this.mask = +mask;
     if (typeof attrs === 'object' && attrs !== null) {
-      Object.keys(attrs).forEach(k => this[k] = attrs[k]);
+      Object.assign(this, attrs);
     }
   }
   /**
@@ -3428,10 +3425,10 @@ class Location extends GeoLocation {
     return true;
   }
 }
-classicCities0.forEach(city => {
+for (const city of classicCities0) {
   const location = new Location(city[2], city[3], city[1] == 'IL', city[4], city[0], city[1], undefined, city[5]);
   Location.addLocation(location.getName(), location);
-});
+}
 
 const _formatters = new Map();
 
@@ -5610,40 +5607,7 @@ const MINOR_HOLIDAY$1 = flags.MINOR_HOLIDAY;
 const EREV$1 = flags.EREV;
 // const CHOL_HAMOED = flags.CHOL_HAMOED;
 
-/**
- * Avoid dependency on ES6 Map object
- * @private
- */
-class SimpleMap {
-  /**
-   * @param {string} key
-   * @return {boolean}
-   */
-  has(key) {
-    return typeof this[key] !== 'undefined';
-  }
-  /**
-   * @param {string} key
-   * @return {any}
-   */
-  get(key) {
-    return this[key];
-  }
-  /**
-   * @param {string} key
-   * @param {any} val
-   */
-  set(key, val) {
-    this[key] = val;
-  }
-  /**
-   * @return {string[]}
-   */
-  keys() {
-    return Object.keys(this);
-  }
-}
-const sedraCache = new SimpleMap();
+const sedraCache = new Map();
 
 /**
  * @private
@@ -5687,13 +5651,12 @@ function getHolidaysForYear_(year) {
   }
   const RH = new HDate(1, TISHREI$1, year);
   const pesach = new HDate(15, NISAN$1, year);
-  const h = new SimpleMap();
+  const map = new Map();
   // eslint-disable-next-line require-jsdoc
   function add(...events) {
-    // for (const ev of events) {
-    events.forEach(ev => {
+    for (const ev of events) {
       const key = ev.date.toString();
-      const arr = h.get(key);
+      const arr = map.get(key);
       if (typeof arr === 'object') {
         if (arr[0].getFlags() & flags.EREV) {
           arr.unshift(ev);
@@ -5701,17 +5664,17 @@ function getHolidaysForYear_(year) {
           arr.push(ev);
         }
       } else {
-        h.set(key, [ev]);
+        map.set(key, [ev]);
       }
-    });
+    }
   }
-  staticHolidays.forEach(h => {
+  for (const h of staticHolidays) {
     const hd = new HDate(h.dd, h.mm, year);
     const ev = new HolidayEvent(hd, h.desc, h.flags);
     if (h.emoji) ev.emoji = h.emoji;
     if (h.chmDay) ev.cholHaMoedDay = h.chmDay;
     add(ev);
-  });
+  }
 
   // standard holidays that don't shift based on year
   add(new RoshHashanaEvent(RH, year, CHAG | LIGHT_CANDLES_TZEIS$1));
@@ -5763,7 +5726,7 @@ function getHolidaysForYear_(year) {
   if (yomHaZikaronDt) {
     add(new HolidayEvent(yomHaZikaronDt, 'Yom HaZikaron', MODERN_HOLIDAY$1, emojiIsraelFlag), new HolidayEvent(yomHaZikaronDt.next(), 'Yom HaAtzma\'ut', MODERN_HOLIDAY$1, emojiIsraelFlag));
   }
-  staticModernHolidays.forEach(h => {
+  for (const h of staticModernHolidays) {
     if (year >= h.firstYear) {
       let hd = new HDate(h.dd, h.mm, year);
       const dow = hd.getDay();
@@ -5781,7 +5744,7 @@ function getHolidaysForYear_(year) {
       }
       add(ev);
     }
-  });
+  }
   let tamuz17 = new HDate(17, TAMUZ, year);
   let tamuz17attrs;
   if (tamuz17.getDay() == SAT$1) {
@@ -5852,8 +5815,8 @@ function getHolidaysForYear_(year) {
       emoji: '☀️'
     }));
   }
-  yearCache.set(year, h);
-  return h;
+  yearCache.set(year, map);
+  return map;
 }
 
 /**
@@ -5920,7 +5883,7 @@ class DailyLearning {
   }
 }
 
-const version="5.0.0";
+const version="5.0.1";
 
 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};
 
@@ -5933,9 +5896,9 @@ Locale.addLocale('he', poHe);
 Locale.addLocale('h', poHe);
 const heStrs = poHe.contexts[''];
 const heNoNikud = {};
-Object.keys(heStrs).forEach(key => {
-  heNoNikud[key] = [Locale.hebrewStripNikkud(heStrs[key][0])];
-});
+for (const [key, val] of Object.entries(heStrs)) {
+  heNoNikud[key] = [Locale.hebrewStripNikkud(val[0])];
+}
 const poHeNoNikud = {
   headers: poHe.headers,
   contexts: {
@@ -6216,24 +6179,12 @@ const RECOGNIZED_OPTIONS = {
  * @param {CalOptions} options
  */
 function warnUnrecognizedOptions(options) {
-  Object.keys(options).forEach(k => {
+  for (const k of Object.keys(options)) {
     if (typeof RECOGNIZED_OPTIONS[k] === 'undefined' && !unrecognizedAlreadyWarned.has(k)) {
       console.warn(`Ignoring unrecognized HebrewCalendar option: ${k}`);
       unrecognizedAlreadyWarned.add(k);
     }
-  });
-}
-
-/**
- * A bit like Object.assign(), but just a shallow copy
- * @private
- * @param {any} target
- * @param {any} source
- * @return {any}
- */
-function shallowCopy(target, source) {
-  Object.keys(source).forEach(k => target[k] = source[k]);
-  return target;
+  }
 }
 const israelCityOffset = {
   'Jerusalem': 40,
@@ -6711,7 +6662,7 @@ class HebrewCalendar {
    * @return {Event[]}
    */
   static calendar(options = {}) {
-    options = shallowCopy({}, options); // so we can modify freely
+    options = Object.assign({}, options); // so we can modify freely
     checkCandleOptions(options);
     const location = options.location = options.location || defaultLocation;
     const il = options.il = options.il || location.il || false;
@@ -6760,9 +6711,9 @@ class HebrewCalendar {
       const dow = hd.getDay();
       let candlesEv;
       const ev = holidaysYear.get(hd.toString()) || [];
-      ev.forEach(e => {
+      for (const e of ev) {
         candlesEv = appendHolidayAndRelated(evts, e, options, candlesEv, dow);
-      });
+      }
       if (options.sedrot && dow === SAT) {
         const parsha0 = sedra.lookup(abs);
         if (!parsha0.chag) {
@@ -6771,8 +6722,7 @@ class HebrewCalendar {
       }
       const dailyLearning = options.dailyLearning;
       if (typeof dailyLearning === 'object') {
-        Object.keys(dailyLearning).forEach(key => {
-          const val = dailyLearning[key];
+        for (const [key, val] of Object.entries(dailyLearning)) {
           if (val) {
             const name = key === 'yerushalmi' ? val === 2 ? 'yerushalmi-schottenstein' : 'yerushalmi-vilna' : key;
             const learningEv = DailyLearning.lookup(name, hd);
@@ -6780,7 +6730,7 @@ class HebrewCalendar {
               evts.push(learningEv);
             }
           }
-        });
+        }
       }
       if (options.omer && abs >= beginOmer && abs <= endOmer) {
         const omer = abs - beginOmer + 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/core",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "contributors": [
     "Eyal Schachter (https://github.com/Scimonster)",
@@ -80,7 +80,7 @@
     "jsdoc": "^4.0.2",
     "jsdoc-to-markdown": "^8.0.0",
     "nyc": "^15.1.0",
-    "rollup": "^4.6.1",
+    "rollup": "^4.7.0",
     "ttag-cli": "^1.10.9"
   }
 }