@hebcal/core 4.3.5 → 4.4.1

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/core v4.3.5 */
+/*! @hebcal/core v4.4.1 */
 /*
  * More minimal greg routines
  */
@@ -323,8 +323,8 @@ function gematriya(number) {
   const thousands = Math.floor(num / 1000);
   if (thousands > 0 && thousands !== 5) {
     const tdigits = num2digits(thousands);
-    for (let i = 0; i < tdigits.length; i++) {
-      str += num2heb[tdigits[i]];
+    for (const tdig of tdigits) {
+      str += num2heb[tdig];
     }
     str += GERESH;
   }
@@ -359,8 +359,8 @@ function gematriyaStrToNum(str) {
     num += gematriyaStrToNum(thousands) * 1000;
     str = str.substring(gereshIdx);
   }
-  for (let i = 0; i < str.length; i++) {
-    const n = heb2num[str[i]];
+  for (const ch of str) {
+    const n = heb2num[ch];
     if (typeof n === 'number') {
       num += n;
     }
@@ -407,7 +407,7 @@ class Locale {
    * @return {string}
    */
   static lookupTranslation(id, locale) {
-    const locale0 = locale && locale.toLowerCase();
+    const locale0 = locale === null || locale === void 0 ? void 0 : locale.toLowerCase();
     const loc = typeof locale == 'string' && locales[locale0] || activeLocale;
     const array = loc[id];
     if (array && array.length && array[0].length) {
@@ -527,7 +527,7 @@ class Locale {
    * @return {string[]}
    */
   static getLocaleNames() {
-    return Object.keys(locales).sort();
+    return Object.keys(locales).sort((a, b) => a.localeCompare(b));
   }
 
   /**
@@ -536,7 +536,7 @@ class Locale {
    * @return {string}
    */
   static ordinal(n, locale) {
-    const locale1 = locale && locale.toLowerCase();
+    const locale1 = locale === null || locale === void 0 ? void 0 : locale.toLowerCase();
     const locale0 = locale1 || activeName;
     if (!locale0) {
       return this.getEnOrdinal(n);
@@ -1201,7 +1201,7 @@ class HDate {
     if (ofStr) {
       return ' ' + ofStr;
     }
-    if ('ashkenazi' === locale.substring(0, 9)) {
+    if (locale.startsWith('ashkenazi')) {
       return ' of';
     }
     return '';
@@ -1590,9 +1590,7 @@ class HDate {
               return months.ADAR_I;
             }
             return months.ADAR_II;
-          // else assume sheini
         }
-
         break;
       case 'ס':
         return months.SIVAN;
@@ -1951,8 +1949,7 @@ class Event {
    */
   getCategories() {
     const mask = this.getFlags();
-    for (let i = 0; i < flagToCategory.length; i++) {
-      const attrs = flagToCategory[i];
+    for (const attrs of flagToCategory) {
       if (mask & attrs[0]) {
         return attrs.slice(1);
       }
@@ -1981,7 +1978,7 @@ class HebrewDateEvent extends Event {
    * @return {string}
    */
   render(locale) {
-    const locale1 = locale && locale.toLowerCase();
+    const locale1 = locale === null || locale === void 0 ? void 0 : locale.toLowerCase();
     const locale0 = locale1 || Locale.getLocaleName();
     const hd = this.getDate();
     switch (locale0) {
@@ -2008,7 +2005,7 @@ class HebrewDateEvent extends Event {
    * @return {string}
    */
   renderBrief(locale) {
-    const locale1 = locale && locale.toLowerCase();
+    const locale1 = locale === null || locale === void 0 ? void 0 : locale.toLowerCase();
     const locale0 = locale1 || Locale.getLocaleName();
     const hd = this.getDate();
     if (hd.getMonth() === months.TISHREI && hd.getDate() === 1) {
@@ -3307,7 +3304,7 @@ function makeFastStartEnd(ev, location) {
   if (desc === 'Erev Tish\'a B\'Av') {
     const sunset = zmanim.sunset();
     ev.startEvent = makeTimedEvent(hd, sunset, 'Fast begins', ev, location);
-  } else if (desc.substring(0, 11) === 'Tish\'a B\'Av') {
+  } else if (desc.startsWith('Tish\'a B\'Av')) {
     ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(TZEIT_3MEDIUM_STARS), 'Fast ends', ev, location);
   } else {
     const dawn = zmanim.alotHaShachar();
@@ -4612,16 +4609,6 @@ const staticModernHolidays = [{
 
 /** Represents a built-in holiday like Pesach, Purim or Tu BiShvat */
 class HolidayEvent extends Event {
-  /**
-   * Constructs Holiday event
-   * @param {HDate} date Hebrew date event occurs
-   * @param {string} desc Description (not translated)
-   * @param {number} [mask=0] optional holiday flags
-   * @param {Object} [attrs={}]
-   */
-  constructor(date, desc, mask, attrs) {
-    super(date, desc, mask, attrs);
-  }
   /** @return {string} */
   basename() {
     return this.getDesc().replace(/ \d{4}$/, '').replace(/ \(CH''M\)$/, '').replace(/ \(observed\)$/, '').replace(/ \(Hoshana Raba\)$/, '').replace(/ [IV]+$/, '').replace(/: \d Candles?$/, '').replace(/: 8th Day$/, '').replace(/^Erev /, '');
@@ -4713,15 +4700,6 @@ class RoshChodeshEvent extends HolidayEvent {
  * we subclass HolidayEvent to override the `url()` method.
  */
 class AsaraBTevetEvent extends HolidayEvent {
-  /**
-   * Constructs AsaraBTevetEvent
-   * @param {HDate} date Hebrew date event occurs
-   * @param {string} desc Description (not translated)
-   * @param {number} [mask=0] optional holiday flags
-   */
-  constructor(date, desc, mask) {
-    super(date, desc, mask);
-  }
   /** @return {string} */
   urlDateSuffix() {
     const isoDateTime = this.getDate().greg().toISOString();
@@ -5257,7 +5235,7 @@ function getBirthdayOrAnniversary_(hyear, gdate) {
   return new HDate(day, month, hyear);
 }
 
-const version="4.3.5";
+const version="4.4.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};
 
@@ -5452,9 +5430,9 @@ function tachanunYear(year, il) {
   );
 
   return {
-    none: none.map(hd => hd.abs()).sort(),
-    some: some.map(hd => hd.abs()).sort(),
-    yesPrev: yesPrev.map(hd => hd.abs()).sort()
+    none: none.map(hd => hd.abs()).sort((a, b) => a - b),
+    some: some.map(hd => hd.abs()).sort((a, b) => a - b),
+    yesPrev: yesPrev.map(hd => hd.abs()).sort((a, b) => a - b)
   };
 }
 
@@ -5591,7 +5569,7 @@ function checkCandleOptions(options) {
     return;
   }
   const location = options.location;
-  if (typeof location === 'undefined' || !location instanceof Location) {
+  if (typeof location === 'undefined' || !(location instanceof Location)) {
     throw new TypeError('options.candlelighting requires valid options.location');
   }
   if (typeof options.havdalahMins === 'number' && typeof options.havdalahDeg === 'number') {
@@ -5758,6 +5736,7 @@ function getStartAndEnd(options) {
  * @return {number}
  */
 function getMaskFromOptions(options) {
+  var _options$location;
   if (typeof options.mask === 'number') {
     const m = options.mask;
     if (m & ROSH_CHODESH) delete options.noRoshChodesh;
@@ -5787,7 +5766,7 @@ function getMaskFromOptions(options) {
     options.userMask = true;
     return m;
   }
-  const il = options.il || options.location && options.location.il || false;
+  const il = options.il || ((_options$location = options.location) === null || _options$location === void 0 ? void 0 : _options$location.il) || false;
   let mask = 0;
 
   // default options
@@ -6045,7 +6024,7 @@ class HebrewCalendar {
       }
       const prevEventsLength = evts.length;
       const dow = hd.getDay();
-      let candlesEv = undefined;
+      let candlesEv;
       const ev = holidaysYear.get(hd.toString()) || [];
       ev.forEach(e => {
         candlesEv = appendHolidayAndRelated(evts, e, options, candlesEv, dow);
@@ -6249,8 +6228,9 @@ 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.location && options.location.cc || (options.il ? 'IL' : 'US');
+    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;
     }
@@ -6386,9 +6366,7 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
         candlesEv = undefined;
       }
     }
-    if (options.yomKippurKatan && eFlags & flags.YOM_KIPPUR_KATAN) {
-      events.push(ev);
-    } else if (!options.noHolidays) {
+    if (!options.noHolidays || options.yomKippurKatan && eFlags & flags.YOM_KIPPUR_KATAN) {
       events.push(ev); // the original event itself
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/core",
-  "version": "4.3.5",
+  "version": "4.4.1",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "contributors": [
     "Eyal Schachter (https://github.com/Scimonster)",
@@ -22,13 +22,9 @@
   "description": "A perpetual Jewish Calendar API",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
-  "exports": {
-    "import": "./dist/index.mjs",
-    "require": "./dist/index.js"
-  },
   "typings": "hebcal.d.ts",
   "engines": {
-    "node": ">= 12.17.0"
+    "node": ">= 16.0.0"
   },
   "repository": {
     "type": "git",
@@ -65,23 +61,23 @@
     "verbose": true
   },
   "devDependencies": {
-    "@babel/core": "^7.23.0",
-    "@babel/preset-env": "^7.22.20",
+    "@babel/core": "^7.23.2",
+    "@babel/preset-env": "^7.23.2",
     "@babel/register": "^7.22.15",
     "@hebcal/solar-calc": "^1.1.2",
-    "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-commonjs": "^25.0.4",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.2.1",
-    "@rollup/plugin-terser": "^0.4.3",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-json": "^6.0.1",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-terser": "^0.4.4",
     "ava": "^5.3.1",
     "core-js": "^3.33.0",
-    "eslint": "^8.50.0",
+    "eslint": "^8.51.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^4.0.2",
     "jsdoc-to-markdown": "^8.0.0",
     "nyc": "^15.1.0",
-    "rollup": "^3.29.4",
+    "rollup": "^4.1.4",
     "ttag-cli": "^1.10.6"
   }
 }