@hebcal/core 3.39.0 → 3.40.0

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/core v3.39.0 */
+/*! @hebcal/core v3.40.0 */
 /*
  * More minimal greg routines
  */
@@ -74,11 +74,12 @@ function dayOfYear(date) {
     throw new TypeError(`Argument not a Date: ${date}`);
   }
 
-  let doy = date.getDate() + 31 * date.getMonth();
+  const month = date.getMonth();
+  let doy = date.getDate() + 31 * month;
 
-  if (date.getMonth() > 1) {
+  if (month > 1) {
     // FEB
-    doy -= Math.floor((4 * (date.getMonth() + 1) + 23) / 10);
+    doy -= Math.floor((4 * (month + 1) + 23) / 10);
 
     if (isLeapYear$1(date.getFullYear())) {
       doy++;
@@ -135,7 +136,7 @@ function yearFromFixed(abs) {
 
 function toFixed(year, month, day) {
   const py = year - 1;
-  return 0 + 365 * py + quotient(py, 4) - quotient(py, 100) + quotient(py, 400) + quotient(367 * month - 362, 12) + Math.floor(month <= 2 ? 0 : isLeapYear$1(year) ? -1 : -2) + day;
+  return 365 * py + quotient(py, 4) - quotient(py, 100) + quotient(py, 400) + quotient(367 * month - 362, 12) + (month <= 2 ? 0 : isLeapYear$1(year) ? -1 : -2) + day;
 }
 /**
  * Converts from Rata Die (R.D. number) to Gregorian date.
@@ -4189,6 +4190,10 @@ function throwError(errorMessage) {
  *     Hebrew date, e.g. `['Noach']` or `['Matot', 'Masei']`
  * @property {boolean} chag True if this is a regular parasha HaShavua
  *     Torah reading, false if it's a special holiday reading
+ * @property {number|number[]} num the parsha number (or numbers) using 1-indexing.
+ *     A `number` for a regular (single) parsha, and a `number[]` for a doubled parsha.
+ *     For Parashat *Bereshit*, `num` would be equal to `1`, and for
+ *     *Matot-Masei* it would be `[42, 43]`
  */
 
 /**
@@ -4380,7 +4385,8 @@ class Sedra {
     if (index >= 0) {
       return {
         parsha: [parshiot[index]],
-        chag: false
+        chag: false,
+        num: index + 1
       };
     }
 
@@ -4388,7 +4394,8 @@ class Sedra {
 
     return {
       parsha: [parshiot[p1], parshiot[p1 + 1]],
-      chag: false
+      chag: false,
+      num: [p1 + 1, p1 + 2]
     };
   }
 
@@ -4605,8 +4612,9 @@ class ParshaEvent extends Event {
    * @param {string[]} parsha - untranslated name of single or double parsha,
    *   such as ['Bereshit'] or ['Achrei Mot', 'Kedoshim']
    * @param {boolean} il
+   * @param {number|number[]} num
    */
-  constructor(date, parsha, il) {
+  constructor(date, parsha, il, num) {
     if (!Array.isArray(parsha) || parsha.length === 0 || parsha.length > 2) {
       throw new TypeError('Bad parsha argument');
     }
@@ -4615,6 +4623,7 @@ class ParshaEvent extends Event {
     super(date, desc, flags.PARSHA_HASHAVUA);
     this.parsha = parsha;
     this.il = Boolean(il);
+    this.num = num || -1;
   }
   /**
    * @param {string} [locale] Optional locale name (i.e: `'he'`, `'fr'`). Defaults to active locale.
@@ -5517,7 +5526,7 @@ function getBirthdayOrAnniversary_(hyear, gdate) {
   return new HDate(day, month, hyear);
 }
 
-const version="3.39.0";
+const version="3.40.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};
 
@@ -5533,17 +5542,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
@@ -5850,7 +5855,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
 
 
@@ -6120,7 +6125,7 @@ class HebrewCalendar {
         const parsha0 = sedra.lookup(abs);
 
         if (!parsha0.chag) {
-          evts.push(new ParshaEvent(hd, parsha0.parsha, il));
+          evts.push(new ParshaEvent(hd, parsha0.parsha, il, parsha0.num));
         }
       }
 

package/hebcal.d.ts

@@ -866,6 +866,14 @@ declare module '@hebcal/core' {
          * Torah reading, false if it's a special holiday reading
          */
         chag: boolean;
+        /**
+         * The parsha number (or numbers) using 1-indexing.
+         * A `number` for a regular (single) parsha, and a `number[]`
+         * for a doubled parsha.
+         * For Parashat *Bereshit*, `num` would be equal to `1`, and for
+         * *Matot-Masei* it would be `[42, 43]`
+         */
+        num: number | number[];
     }
 
     export class Sedra {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/core",
-  "version": "3.39.0",
+  "version": "3.40.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "contributors": [
     "Eyal Schachter (https://github.com/Scimonster)",
@@ -73,13 +73,13 @@
     "@rollup/plugin-node-resolve": "^13.3.0",
     "ava": "^4.3.0",
     "codecov": "^3.8.3",
-    "core-js": "^3.23.1",
-    "eslint": "^8.17.0",
+    "core-js": "^3.23.2",
+    "eslint": "^8.18.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^3.6.10",
     "jsdoc-to-markdown": "^7.1.1",
     "nyc": "^15.1.0",
-    "rollup": "^2.75.6",
+    "rollup": "^2.75.7",
     "rollup-plugin-terser": "^7.0.2",
     "tsd-jsdoc": "^2.5.0",
     "ttag-cli": "^1.9.4"