@hebcal/leyning 8.2.5 → 8.2.7

package/dist/index.cjs

@@ -1,4 +1,4 @@
-/*! @hebcal/leyning v8.2.5 */
+/*! @hebcal/leyning v8.2.7 */
 'use strict';
 
 var core = require('@hebcal/core');
@@ -55,7 +55,14 @@ var numverses = {
  * Names of the books of the Torah. BOOK[1] === 'Genesis'
  * @readonly
  */
-const BOOK = ['', 'Genesis', 'Exodus', 'Leviticus', 'Numbers', 'Deuteronomy'];
+const BOOK = [
+    '',
+    'Genesis',
+    'Exodus',
+    'Leviticus',
+    'Numbers',
+    'Deuteronomy',
+];
 /**
  * Formats parsha as a string
  * @param parsha untranslated name like 'Pinchas' or ['Pinchas'] or ['Matot','Masei']
@@ -64,7 +71,9 @@ function parshaToString(parsha) {
     if (typeof parsha === 'string') {
         return parsha;
     }
-    else if (!Array.isArray(parsha) || parsha.length === 0 || parsha.length > 2) {
+    else if (!Array.isArray(parsha) ||
+        parsha.length === 0 ||
+        parsha.length > 2) {
         throw new TypeError(`Bad parsha argument: ${parsha}`);
     }
     let s = parsha[0];
@@ -131,16 +140,16 @@ function formatAliyahShort(aliyah, showBook) {
  * @private
  */
 function isChapVerseBefore(a, b) {
-    const cv1 = a.split(':').map((x) => +x);
-    const cv2 = b.split(':').map((x) => +x);
-    return (cv1[0] * 100 + cv1[1]) < (cv2[0] * 100 + cv2[1]);
+    const cv1 = a.split(':').map(x => +x);
+    const cv2 = b.split(':').map(x => +x);
+    return cv1[0] * 100 + cv1[1] < cv2[0] * 100 + cv2[1];
 }
 /**
  * Summarizes an `AliyotMap` by collapsing all adjacent aliyot.
  * Finds any non-overlapping parts (e.g. special 7th aliyah or maftir)
  */
 function makeLeyningParts(aliyot) {
-    const nums = Object.keys(aliyot).filter((x) => {
+    const nums = Object.keys(aliyot).filter(x => {
         if (x.length === 1) {
             return true;
         }
@@ -153,15 +162,17 @@ function makeLeyningParts(aliyot) {
     for (let i = 0; i < nums.length; i++) {
         const num = nums[i];
         const aliyah = aliyot[num];
-        if ((i === nums.length - 1) && (aliyah.k === end.k) && (aliyah.e === end.e)) {
+        if (i === nums.length - 1 && aliyah.k === end.k && aliyah.e === end.e) {
             // short-circuit when final aliyah is within the previous (e.g. M inside of 7)
             continue;
         }
-        const prevEndChap = +(end.e.split(':')[0]);
-        const curStartChap = +(aliyah.b.split(':')[0]);
+        const prevEndChap = +end.e.split(':')[0];
+        const curStartChap = +aliyah.b.split(':')[0];
         const sameOrNextChap = curStartChap === prevEndChap || curStartChap === prevEndChap + 1;
-        if ((i !== 0) &&
-            (aliyah.k !== start.k || isChapVerseBefore(aliyah.b, start.e) || !sameOrNextChap)) {
+        if (i !== 0 &&
+            (aliyah.k !== start.k ||
+                isChapVerseBefore(aliyah.b, start.e) ||
+                !sameOrNextChap)) {
             parts.push({ k: start.k, b: start.b, e: end.e });
             start = aliyah;
         }
@@ -227,7 +238,9 @@ function cloneHaftara(haft) {
  * Returns the total number of verses in an array of Aliyah (or haftarah) objects
  */
 function sumVerses(aliyot) {
-    return Array.isArray(aliyot) ? aliyot.reduce((prev, cur) => prev + cur.v, 0) : aliyot.v;
+    return Array.isArray(aliyot)
+        ? aliyot.reduce((prev, cur) => prev + cur.v, 0)
+        : aliyot.v;
 }
 
 var festivals0 = { "Pesach I": {
@@ -882,9 +895,15 @@ function lookupFestival(holiday) {
     return result;
 }
 
-const HOLIDAY_IGNORE_MASK = core.flags.DAF_YOMI | core.flags.OMER_COUNT | core.flags.SHABBAT_MEVARCHIM |
-    core.flags.MOLAD | core.flags.USER_EVENT | core.flags.HEBREW_DATE | core.flags.MISHNA_YOMI |
-    core.flags.MODERN_HOLIDAY | core.flags.YERUSHALMI_YOMI;
+const HOLIDAY_IGNORE_MASK = core.flags.DAF_YOMI |
+    core.flags.OMER_COUNT |
+    core.flags.SHABBAT_MEVARCHIM |
+    core.flags.MOLAD |
+    core.flags.USER_EVENT |
+    core.flags.HEBREW_DATE |
+    core.flags.MISHNA_YOMI |
+    core.flags.MODERN_HOLIDAY |
+    core.flags.YERUSHALMI_YOMI;
 /**
  * Based on the event date, type and title, finds the relevant leyning key
  * @param ev event
@@ -908,13 +927,15 @@ function getLeyningKeyForEvent(ev, il = false) {
     const day = hd.getDate();
     const dow = hd.abs() % 7;
     const month = hd.getMonth();
-    const isShabbat = (dow == 6);
-    const isRoshChodesh = (day == 1 || day == 30);
+    const isShabbat = dow == 6;
+    const isRoshChodesh = day == 1 || day == 30;
     const holiday = ev.basename();
     const isPesach = holiday === 'Pesach';
     if (il && isPesach) {
         if (isShabbat) {
-            return day === 15 || day === 21 ? desc + ' (on Shabbat)' : 'Pesach Shabbat Chol ha-Moed';
+            return day === 15 || day === 21
+                ? desc + ' (on Shabbat)'
+                : 'Pesach Shabbat Chol ha-Moed';
         }
         return desc;
     }
@@ -931,10 +952,10 @@ function getLeyningKeyForEvent(ev, il = false) {
             return 'Sukkot Final Day (Hoshana Raba)';
         }
         if (isPesach && cholHaMoedDay) {
-            if (dow === 0 && desc === 'Pesach IV (CH\'\'M)') {
+            if (dow === 0 && desc === "Pesach IV (CH''M)") {
                 return 'Pesach Chol ha-Moed Day 2 on Sunday';
             }
-            else if (dow === 1 && desc === 'Pesach V (CH\'\'M)') {
+            else if (dow === 1 && desc === "Pesach V (CH''M)") {
                 return 'Pesach Chol ha-Moed Day 3 on Monday';
             }
         }
@@ -946,7 +967,7 @@ function getLeyningKeyForEvent(ev, il = false) {
             return 'Shabbat Rosh Chodesh Chanukah';
         }
         else if (isRoshChodesh && chanukahDay == 7) {
-            return `Chanukah Day 7 (on Rosh Chodesh)`;
+            return 'Chanukah Day 7 (on Rosh Chodesh)';
         }
         else if (isShabbat) {
             return `Chanukah Day ${chanukahDay} (on Shabbat)`;
@@ -955,7 +976,8 @@ function getLeyningKeyForEvent(ev, il = false) {
             return `Chanukah Day ${chanukahDay}`;
         }
     }
-    if (isRoshChodesh && (desc == 'Shabbat HaChodesh' || desc == 'Shabbat Shekalim')) {
+    if (isRoshChodesh &&
+        (desc == 'Shabbat HaChodesh' || desc == 'Shabbat Shekalim')) {
         return desc + ' (on Rosh Chodesh)';
     }
     if (il && desc == 'Shmini Atzeret') {
@@ -1002,8 +1024,8 @@ function getLeyningKeyForEvent(ev, il = false) {
     if (isRoshChodesh) {
         return desc;
     }
-    if (desc === 'Tish\'a B\'Av (observed)') {
-        return 'Tish\'a B\'Av';
+    if (desc === "Tish'a B'Av (observed)") {
+        return "Tish'a B'Av";
     }
     return undefined;
 }
@@ -1080,7 +1102,7 @@ function specialReadings2(parsha, hd, il, aliyot) {
     }
     const parshaName = parshaToString(parsha);
     const events0 = core.HebrewCalendar.getHolidaysOnDate(hd, il) || [];
-    const events = events0.filter((ev) => !(ev.getFlags() & core.flags.ROSH_CHODESH));
+    const events = events0.filter(ev => !(ev.getFlags() & core.flags.ROSH_CHODESH));
     for (const ev of events) {
         if (ev.getDesc() === 'Shabbat Shuva') {
             handleSpecial(`Shabbat Shuva (with ${parshaName})`);
@@ -1100,9 +1122,9 @@ function specialReadings2(parsha, hd, il, aliyot) {
             handleSpecial('Pinchas occurring after 17 Tammuz');
         }
         else if (day === 30 || day === 1) {
-            const key = (parshaName === 'Masei' || parshaName === 'Matot-Masei') ?
-                `${parshaName} on Shabbat Rosh Chodesh` :
-                'Shabbat Rosh Chodesh';
+            const key = parshaName === 'Masei' || parshaName === 'Matot-Masei'
+                ? `${parshaName} on Shabbat Rosh Chodesh`
+                : 'Shabbat Rosh Chodesh';
             handleSpecial(key);
         }
         else if (parshaName === 'Ki Teitzei' && day === 14) {
@@ -1114,7 +1136,8 @@ function specialReadings2(parsha, hd, il, aliyot) {
             // Source: Luaḥ Hashanah, Rabbi Miles B. Cohen and Leslie Rubin
             handleSpecial('Ki Teitzei with 3rd Haftarah of Consolation');
         }
-        else if (parshaName === 'Kedoshim' && (day === 26 || day === 28 || day === 6)) {
+        else if (parshaName === 'Kedoshim' &&
+            (day === 26 || day === 28 || day === 6)) {
             // Kedoshim is read separately from Achrei Mot in ~37% of years.
             // When this happens, it is will be read on
             // 26th or 28th of Nisan (Achrei Mot was Shabbat HaGadol, ~10%),
@@ -1154,7 +1177,9 @@ function getLeyningForHolidayKey(key, cholHaMoedDay, il) {
         return undefined;
     }
     const israelOnly = src.il;
-    if (typeof israelOnly === 'boolean' && typeof il === 'boolean' && il !== israelOnly) {
+    if (typeof israelOnly === 'boolean' &&
+        typeof il === 'boolean' &&
+        il !== israelOnly) {
         return undefined;
     }
     const leyning = {
@@ -1178,15 +1203,15 @@ function getLeyningForHolidayKey(key, cholHaMoedDay, il) {
                 leyning.summaryParts = parts;
             }
         }
-        Object.values(leyning.fullkriyah).map((aliyah) => calculateNumVerses(aliyah));
+        Object.values(leyning.fullkriyah).map(aliyah => calculateNumVerses(aliyah));
     }
     if (src.haft) {
-        const haft = leyning.haft = cloneHaftara(src.haft);
+        const haft = (leyning.haft = cloneHaftara(src.haft));
         leyning.haftara = makeSummaryFromParts(haft);
         leyning.haftaraNumV = sumVerses(haft);
     }
     if (src.seph) {
-        const seph = leyning.seph = cloneHaftara(src.seph);
+        const seph = (leyning.seph = cloneHaftara(src.seph));
         leyning.sephardic = makeSummaryFromParts(seph);
         leyning.sephardicNumV = sumVerses(seph);
     }
@@ -2542,7 +2567,7 @@ function makeLeyningNames(parsha) {
     const name = parshaToString(parsha);
     return {
         en: name,
-        he: parsha.map((s) => core.Locale.lookupTranslation(s, 'he')).join('־'),
+        he: parsha.map(s => core.Locale.lookupTranslation(s, 'he')).join('־'),
     };
 }
 /**
@@ -2579,13 +2604,13 @@ function getLeyningForParshaShabbatOnly(parsha) {
     const hkey = getHaftaraKey(parshaNameArray);
     const haft0 = parshiyotObj[hkey].haft;
     if (haft0) {
-        const haft = result.haft = cloneHaftara(haft0);
+        const haft = (result.haft = cloneHaftara(haft0));
         result.haftara = makeSummaryFromParts(haft);
         result.haftaraNumV = sumVerses(haft);
     }
     const seph0 = parshiyotObj[hkey].seph;
     if (seph0) {
-        const seph = result.seph = cloneHaftara(seph0);
+        const seph = (result.seph = cloneHaftara(seph0));
         result.sephardic = makeSummaryFromParts(seph);
         result.sephardicNumV = sumVerses(seph);
     }
@@ -2644,11 +2669,11 @@ function getLeyningForParshaHaShavua(ev, il = false) {
     const special = specialReadings2(parsha, hd, il, result.fullkriyah);
     const reason = special.reason;
     if (special.haft) {
-        const haft = result.haft = cloneHaftara(special.haft);
+        const haft = (result.haft = cloneHaftara(special.haft));
         result.haftara = makeSummaryFromParts(haft);
         result.haftaraNumV = sumVerses(haft);
         if (special.seph) {
-            const seph = result.seph = cloneHaftara(special.seph);
+            const seph = (result.seph = cloneHaftara(special.seph));
             result.sephardic = makeSummaryFromParts(seph);
             result.sephardicNumV = sumVerses(seph);
         }
@@ -2789,6 +2814,9 @@ function getLeyningOnDate(hdate, il, wantarray = false) {
         }
         const reading = getLeyningForHoliday(ev, il);
         if (reading) {
+            // Skip duplicate readings from overlapping events (eg, Rosh Chodesh + Chanukah)
+            if (arr.some(r => r.name.en === reading.name.en))
+                continue;
             const fk = reading.fullkriyah;
             if (fk) {
                 hasFullKriyah = true;
@@ -2844,14 +2872,16 @@ function getMincha(ev, il) {
 }
 
 const fmt = new Intl.DateTimeFormat('en-US', {
-    year: 'numeric', month: 'short', day: '2-digit',
+    year: 'numeric',
+    month: 'short',
+    day: '2-digit',
 });
 function fmtDate(dt) {
     const s = fmt.format(dt).split(' ');
     return s[1].substring(0, 2) + '-' + s[0] + '-' + s[2];
 }
 function getParshaDates(events) {
-    const parshaEvents = events.filter((ev) => ev.getFlags() === core.flags.PARSHA_HASHAVUA);
+    const parshaEvents = events.filter(ev => ev.getFlags() === core.flags.PARSHA_HASHAVUA);
     const emptyMap = {};
     const parshaDates = parshaEvents.reduce((set, ev) => {
         set[ev.getDate().toString()] = true;
@@ -2870,7 +2900,8 @@ function writeFullKriyahCsv(stream, hyear, il) {
     const parshaDates = getParshaDates(events);
     stream.write('"Date","Parashah","Aliyah","Reading","Verses"\r\n');
     for (const ev of events) {
-        if (ev.getFlags() === core.flags.PARSHA_HASHAVUA || !parshaDates[ev.getDate().toString()]) {
+        if (ev.getFlags() === core.flags.PARSHA_HASHAVUA ||
+            !parshaDates[ev.getDate().toString()]) {
             writeFullKriyahEvent(stream, ev, il);
         }
     }
@@ -2891,7 +2922,9 @@ function writeFullKriyahEvent(stream, ev, il) {
     }
     const mask = ev.getFlags();
     const isParsha = mask === core.flags.PARSHA_HASHAVUA;
-    const reading = isParsha ? getLeyningForParshaHaShavua(ev, il) : getLeyningForHoliday(ev, il);
+    const reading = isParsha
+        ? getLeyningForParshaHaShavua(ev, il)
+        : getLeyningForHoliday(ev, il);
     if (reading) {
         writeCsvLines(stream, ev, reading, il, isParsha);
         if (!isParsha) {
@@ -2920,7 +2953,9 @@ function writeHolidayMincha(stream, ev, il) {
  * Formats reading for CSV
  */
 function writeCsvLines(stream, ev, reading, il, isParsha) {
-    const parsha = isParsha ? ev.basename() : getLeyningKeyForEvent(ev, il) || ev.render();
+    const parsha = isParsha
+        ? ev.basename()
+        : getLeyningKeyForEvent(ev, il) || ev.render();
     const date = fmtDate(ev.getDate().greg());
     const lines = getFullKriyahLines(reading);
     for (const s of lines) {
@@ -2960,7 +2995,11 @@ function getFullKriyahLines(reading) {
         if ((_c = reading.reason) === null || _c === void 0 ? void 0 : _c.sephardic) {
             sephardic += ' | ' + reading.reason.sephardic;
         }
-        lines.push(['Haftara for Sephardim', sephardic, reading.sephardicNumV || '']);
+        lines.push([
+            'Haftara for Sephardim',
+            sephardic,
+            reading.sephardicNumV || '',
+        ]);
     }
     if (reading.triHaftara) {
         const haftara = reading.triHaftara.replace(/,/g, ';');

package/dist/index.d.ts

@@ -7,5 +7,5 @@ export * from './specialReadings';
 export * from './getLeyningForHoliday';
 export * from './leyning';
 export { getLeyningOnDate } from './getLeyningOnDate';
-export { writeFullKriyahCsv, writeCsvLines, writeHolidayMincha, StringToBoolMap, getParshaDates } from './csv';
+export { writeFullKriyahCsv, writeCsvLines, writeHolidayMincha, StringToBoolMap, getParshaDates, } from './csv';
 export * from './clone';