@hebcal/leyning 6.2.2 → 6.2.4

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/leyning v6.2.2 */
+/*! @hebcal/leyning v6.2.4 */
 import { flags, months, HDate, HebrewCalendar, Event, Locale, ParshaEvent } from '@hebcal/core';
 
 const Genesis=[0,31,25,24,26,32,22,24,22,29,32,32,20,18,24,21,16,27,33,38,18,34,24,20,67,34,35,46,22,35,43,54,33,20,31,29,43,36,30,23,23,57,38,34,34,28,34,31,22,33,26];const Exodus=[0,22,25,22,31,23,30,29,28,35,29,10,51,22,31,27,36,16,27,25,26,37,30,33,18,40,37,21,43,46,38,18,35,23,35,35,38,29,31,43,38];const Leviticus=[0,17,16,17,35,26,23,38,36,24,20,47,8,59,57,33,34,16,30,37,27,24,33,44,23,55,46,34];const Numbers=[0,54,34,51,49,31,27,89,26,23,36,35,16,33,45,41,35,28,32,22,29,35,41,30,25,19,65,23,31,39,17,54,42,56,29,34,13];const Deuteronomy=[0,46,37,29,49,30,25,26,20,29,22,32,31,19,29,23,22,20,22,21,20,23,29,26,22,19,19,26,69,28,20,30,52,29,12];const Joshua=[0,18,24,17,24,15,27,26,35,27,43,23,24,33,15,63,10,18,28,51,9,45,34,16,33];const Judges=[0,36,23,31,24,31,40,25,35,57,18,40,15,25,20,20,31,13,31,30,48,25];const Ruth=[0,22,23,18,22];const Isaiah=[0,31,22,26,6,30,13,25,23,20,34,16,6,22,32,9,14,14,7,25,6,17,25,18,23,12,21,13,29,24,33,9,20,24,17,10,22,38,22,8,31,29,25,28,28,25,13,15,22,26,11,23,15,12,17,13,12,21,14,21,22,11,12,19,11,25,24];const Jeremiah=[0,19,37,25,31,31,30,34,23,25,25,23,17,27,22,21,21,27,23,15,18,14,30,40,10,38,24,22,17,32,24,40,44,26,22,19,32,21,28,18,16,18,22,13,30,5,28,7,47,39,46,64,34];const Lamentations=[0,22,22,66,22,22];const Baruch=[0,22,35,38,37,9,72];const Ezekiel=[0,28,10,27,17,17,14,27,18,11,22,25,28,23,23,8,63,24,32,14,44,37,31,49,27,17,21,36,26,21,26,18,32,33,31,15,38,28,23,29,49,26,20,27,31,25,24,23,35];const Daniel=[0,21,49,100,34,30,29,28,27,27,21,45,13,64,42];const Hosea=[0,9,25,5,19,15,11,16,14,17,15,11,15,15,10];const Joel=[0,20,27,5,21];const Amos=[0,15,16,15,13,27,14,17,14,15];const Obadiah=[0,21];const Jonah=[0,16,11,10,11];const Micah=[0,16,13,12,14,14,16,20];const Nachum=[0,14,14,19];const Habakkuk=[0,17,20,19];const Zephaniah=[0,18,15,20];const Haggai=[0,15,23];const Zechariah=[0,17,17,10,14,11,15,14,23,17,12,17,14,9,21];const Malachi=[0,14,17,24];var numverses = {Genesis:Genesis,Exodus:Exodus,Leviticus:Leviticus,Numbers:Numbers,Deuteronomy:Deuteronomy,Joshua:Joshua,Judges:Judges,Ruth:Ruth,"I Samuel":[0,28,36,21,22,12,21,17,22,27,27,15,25,23,52,35,23,58,30,24,42,16,23,28,23,43,25,12,25,11,31,13],"II Samuel":[0,27,32,39,12,25,23,29,18,13,19,27,31,39,33,37,23,29,32,44,26,22,51,39,25],"I Kings":[0,53,46,28,20,32,38,51,66,28,29,43,33,34,31,34,34,24,46,21,43,29,54],"II Kings":[0,18,25,27,44,27,33,20,29,37,36,20,22,25,29,38,20,41,37,37,21,26,20,37,20,30],Isaiah:Isaiah,Jeremiah:Jeremiah,Lamentations:Lamentations,Baruch:Baruch,Ezekiel:Ezekiel,Daniel:Daniel,Hosea:Hosea,Joel:Joel,Amos:Amos,Obadiah:Obadiah,Jonah:Jonah,Micah:Micah,Nachum:Nachum,Habakkuk:Habakkuk,Zephaniah:Zephaniah,Haggai:Haggai,Zechariah:Zechariah,Malachi:Malachi};
@@ -8,23 +8,21 @@ const Genesis=[0,31,25,24,26,32,22,24,22,29,32,32,20,18,24,21,16,27,33,38,18,34,
  * @readonly
  * @const {string[]}
  */
-
 const BOOK = ['', 'Genesis', 'Exodus', 'Leviticus', 'Numbers', 'Deuteronomy'];
+
 /**
  * Formats parsha as a string
  * @param {string[]} parsha
  * @return {string}
  */
-
 function parshaToString(parsha) {
   let s = parsha[0];
-
   if (parsha.length == 2) {
     s += '-' + parsha[1];
   }
-
   return s;
 }
+
 /**
  * Represents an aliyah
  * @typedef {Object} Aliyah
@@ -40,10 +38,10 @@ function parshaToString(parsha) {
  * @param {any} src
  * @return {any}
  */
-
 function clone(src) {
   return JSON.parse(JSON.stringify(src));
 }
+
 /**
  * Calculates the number of verses in an aliyah or haftara based on
  * the `b` (begin verse), `e` (end verse) and `k` (book).
@@ -51,98 +49,85 @@ function clone(src) {
  * @param {Aliyah} aliyah
  * @return {number}
  */
-
 function calculateNumVerses(aliyah) {
   if (aliyah.v) {
     return aliyah.v;
   }
-
   const chapVerseBegin = aliyah.b.split(':');
   const chapVerseEnd = aliyah.e.split(':');
   const c1 = parseInt(chapVerseBegin[0], 10);
   const c2 = parseInt(chapVerseEnd[0], 10);
   const v1 = parseInt(chapVerseBegin[1], 10);
   const v2 = parseInt(chapVerseEnd[1], 10);
-
   if (c1 === c2) {
     aliyah.v = v2 - v1 + 1;
   } else if (typeof aliyah.k === 'string') {
     const numv = numverses[aliyah.k];
-
     if (typeof numv !== 'object' || !numv.length) {
       throw new ReferenceError(`Can't find numverses for ${aliyah.k}`);
     }
-
     let total = numv[c1] - v1 + 1;
-
     for (let chap = c1 + 1; chap < c2; chap++) {
       total += numv[chap];
     }
-
     total += v2;
     aliyah.v = total;
   }
-
   return aliyah.v;
 }
+
 /**
  * Formats an aliyah object like "Numbers 28:9-28:15"
  * @param {Aliyah} a aliyah
  * @return {string}
  */
-
 function formatAliyahWithBook(a) {
   return `${a.k} ${a.b}-${a.e}`;
 }
+
 /**
  * Formats an aliyah object like "Numbers 28:9-15"
  * @param {Aliyah} aliyah
  * @param {boolean} showBook
  * @return {string}
  */
-
 function formatAliyahShort(aliyah, showBook) {
   const begin = aliyah.b;
   const end0 = aliyah.e;
   const prefix = showBook ? aliyah.k + ' ' : '';
-
   if (begin === end0) {
     return `${prefix}${begin}`;
   }
-
   const cv1 = begin.split(':');
   const cv2 = end0.split(':');
   const end = cv1[0] === cv2[0] ? cv2[1] : end0;
   return `${prefix}${begin}-${end}`;
 }
+
 /**
  * Returns the total number of verses in an array of Aliyah (or haftarah) objects
  * @param {Aliyah|Aliyah[]} aliyot
  * @return {number}
  */
-
 function sumVerses(aliyot) {
   return Array.isArray(aliyot) ? aliyot.reduce((prev, cur) => prev + cur.v, 0) : aliyot.v;
 }
+
 /**
  * @private
  * @param {Aliyah|Aliyah[]} haft
  * @return {Aliyah|Aliyah[]}
  */
-
 function cloneHaftara(haft) {
   if (!haft) {
     return haft;
   }
-
   const dest = clone(haft);
-
   if (Array.isArray(dest)) {
     dest.map(calculateNumVerses);
   } else {
     calculateNumVerses(dest);
   }
-
   return dest;
 }
 
@@ -152,39 +137,33 @@ function cloneHaftara(haft) {
  * @param {string} b
  * @return {boolean}
  */
-
 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];
 }
+
 /**
  * Summarizes an `AliyotMap` by collapsing all adjacent aliyot.
  * Finds any non-overlapping parts (e.g. special 7th aliyah or maftir)
  * @param {Object<string,Aliyah>} aliyot
  * @return {Aliyah[]}
  */
-
-
 function makeLeyningParts(aliyot) {
   const nums = Object.keys(aliyot).filter(x => x.length === 1);
   let start = aliyot[nums[0]];
   let end = start;
   const parts = [];
-
   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) {
       // 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 sameOrNextChap = curStartChap === prevEndChap || curStartChap === prevEndChap + 1;
-
     if (i !== 0 && (aliyah.k !== start.k || isChapVerseBefore(aliyah.b, start.e) || !sameOrNextChap)) {
       parts.push({
         k: start.k,
@@ -193,10 +172,8 @@ function makeLeyningParts(aliyot) {
       });
       start = aliyah;
     }
-
     end = aliyah;
   }
-
   parts.push({
     k: start.k,
     b: start.b,
@@ -204,6 +181,7 @@ function makeLeyningParts(aliyot) {
   });
   return parts;
 }
+
 /**
  * Returns a string representation of the leyning parts.
  * Separate verse ranges read from the same book are separated
@@ -213,36 +191,30 @@ function makeLeyningParts(aliyot) {
  * @param {Aliyah|Aliyah[]} parts
  * @return {string}
  */
-
 function makeSummaryFromParts(parts) {
   if (!Array.isArray(parts)) {
     parts = [parts];
   }
-
   let prev = parts[0];
   let summary = formatAliyahShort(prev, true);
-
   for (let i = 1; i < parts.length; i++) {
     const part = parts[i];
-
     if (part.k === prev.k) {
       summary += ', ';
     } else {
       summary += `; ${part.k} `;
     }
-
     summary += formatAliyahShort(part, false);
     prev = part;
   }
-
   return summary;
 }
+
 /**
  * Makes a summary of the leyning, like "Genesis 6:9-11:32"
  * @param {Object<string,Aliyah>} aliyot
  * @return {string}
  */
-
 function makeLeyningSummary(aliyot) {
   const parts = makeLeyningParts(aliyot);
   return makeSummaryFromParts(parts);
@@ -255,35 +227,28 @@ const Purim={fullkriyah:{"1":{p:16,k:2,b:"17:8",e:"17:10"},"2":{p:16,k:2,b:"17:1
  * @param {string} holiday
  * @return {boolean}
  */
-
 function hasFestival(holiday) {
   return typeof festivals[holiday] === 'object';
 }
+
 /**
  * Returns the raw metadata for festival reading for `holiday`
  * @param {string} holiday
  * @return {any}
  */
-
 function lookupFestival(holiday) {
   let src = festivals[holiday];
-
   if (typeof src === 'undefined') {
     return undefined;
   }
-
   if (src.alias) {
     const tmp = festivals[src.key];
-
     if (typeof tmp === 'undefined') {
       throw new Error(`Leyning alias ${holiday} => ${src.key} not found`);
     }
-
     src = tmp;
   }
-
   const result = src.fullkriyah ? clone(src) : src;
-
   if (result.fullkriyah) {
     Object.values(result.fullkriyah).forEach(aliyah => {
       if (typeof aliyah.k === 'number') {
@@ -291,32 +256,27 @@ function lookupFestival(holiday) {
       }
     });
   }
-
   return result;
 }
 
-const HOLIDAY_IGNORE_MASK = flags.DAF_YOMI | flags.OMER_COUNT | flags.SHABBAT_MEVARCHIM | flags.MOLAD | flags.USER_EVENT | flags.HEBREW_DATE | flags.MISHNA_YOMI | flags.MODERN_HOLIDAY;
+const HOLIDAY_IGNORE_MASK = flags.DAF_YOMI | flags.OMER_COUNT | flags.SHABBAT_MEVARCHIM | flags.MOLAD | flags.USER_EVENT | flags.HEBREW_DATE | flags.MISHNA_YOMI | flags.MODERN_HOLIDAY | flags.YERUSHALMI_YOMI;
+
 /**
  * Based on the event date, type and title, finds the relevant leyning key
  * @param {Event} ev event
  * @param {boolean} [il] true if Israel holiday scheme
  * @return {string} key to look up in holiday-reading.json
  */
-
 function getLeyningKeyForEvent(ev, il = false) {
   const mask = ev.getFlags();
-
   if (mask & HOLIDAY_IGNORE_MASK) {
     return undefined;
-  } // Skip all Erevs except for Simchat Torah
-
-
+  }
+  // Skip all Erevs except for Simchat Torah
   const desc = ev.getDesc();
-
   if (mask & flags.EREV && desc !== 'Erev Simchat Torah') {
     return undefined;
   }
-
   const hd = ev.getDate();
   const day = hd.getDate();
   const dow = hd.abs() % 7;
@@ -325,15 +285,12 @@ function getLeyningKeyForEvent(ev, il = false) {
   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 desc;
   }
-
   if (day == 1 && month === months.TISHREI) {
     return isShabbat ? 'Rosh Hashana I (on Shabbat)' : 'Rosh Hashana I';
   } else if (ev.cholHaMoedDay) {
@@ -342,12 +299,10 @@ function getLeyningKeyForEvent(ev, il = false) {
       return holiday + ' Shabbat Chol ha-Moed';
     } else if (desc == 'Sukkot VII (Hoshana Raba)') {
       return 'Sukkot Final Day (Hoshana Raba)';
-    } // If Shabbat falls on the third day of Chol ha-Moed Pesach,
+    }
+    // If Shabbat falls on the third day of Chol ha-Moed Pesach,
     // the readings for the third, fourth, and fifth days are moved ahead
-
-
     let cholHaMoedDay = ev.cholHaMoedDay;
-
     if (isPesach && cholHaMoedDay >= 3) {
       if (dow == 0 && cholHaMoedDay == 4) {
         cholHaMoedDay = 3;
@@ -355,7 +310,6 @@ function getLeyningKeyForEvent(ev, il = false) {
         cholHaMoedDay = 4;
       }
     }
-
     return `${holiday} Chol ha-Moed Day ${cholHaMoedDay}`;
   } else if (ev.chanukahDay) {
     if (isShabbat && isRoshChodesh) {
@@ -368,54 +322,45 @@ function getLeyningKeyForEvent(ev, il = false) {
       return `Chanukah Day ${ev.chanukahDay}`;
     }
   }
-
   if (isRoshChodesh && (desc == 'Shabbat HaChodesh' || desc == 'Shabbat Shekalim')) {
     return desc + ' (on Rosh Chodesh)';
   }
-
   if (desc == 'Shavuot') {
     return 'Shavuot I';
   } else if (il && desc == 'Shmini Atzeret') {
     return 'Simchat Torah';
   }
-
+  if (desc === 'Chag HaBanot') {
+    return undefined;
+  }
   if (isShabbat && 'Shabbat' != desc.substring(0, 7)) {
     if (isRoshChodesh) {
       if (desc === 'Rosh Chodesh Tevet') {
         return 'Shabbat Rosh Chodesh Chanukah';
       }
-
       return 'Shabbat Rosh Chodesh';
     }
-
     const desc2 = desc + ' (on Shabbat)';
-
     if (hasFestival(desc2)) {
       return desc2;
     }
   }
-
   if (hasFestival(desc)) {
     return desc;
   }
-
   if (isShabbat) {
     const tommorow = hd.next().getDate();
-
     if (tommorow === 30 || tommorow === 1) {
       return 'Shabbat Machar Chodesh';
     }
   }
-
   if (desc === 'Rosh Hashana LaBehemot') {
     return undefined;
   }
-
   if (desc === 'Rosh Chodesh Tevet') {
     if (isShabbat) {
       return 'Shabbat Rosh Chodesh Chanukah';
     }
-
     if (day === 30 || HDate.shortKislev(hd.getFullYear())) {
       return 'Chanukah Day 6'; // 30th of Kislev or 1st of Tevet
     } else {
@@ -426,11 +371,9 @@ function getLeyningKeyForEvent(ev, il = false) {
   if (isRoshChodesh) {
     return desc;
   }
-
   if (desc === 'Tish\'a B\'Av (observed)') {
     return 'Tish\'a B\'Av';
   }
-
   return undefined;
 }
 
@@ -438,45 +381,40 @@ function getLeyningKeyForEvent(ev, il = false) {
  * @private
  * @param {Object<string,Aliyah>} aliyot
  */
-
 function aliyotCombine67(aliyot) {
   const a6 = clone(aliyot['6']);
   const a7 = aliyot['7'];
-
   if (a6.k !== a7.k) {
     throw new Error('Impossible to combine aliyot 6 & 7: ' + JSON.stringify(aliyot));
   }
-
   delete aliyot['7'];
   aliyot['6'] = {
     k: a6.k,
     b: a6.b,
     e: a7.e
   };
-
   if (a6.v && a7.v) {
     aliyot['6'].v = a6.v + a7.v;
   }
 }
+
 /**
  * @private
  * @param {Object<string,Aliyah>} aliyot
  * @param {Object<string,Aliyah>} special
  */
-
-
 function mergeAliyotWithSpecial(aliyot, special) {
   if (special['7']) {
     aliyotCombine67(aliyot);
     aliyot['7'] = clone(special['7']);
     calculateNumVerses(aliyot['7']);
   }
-
   if (special['M']) {
     aliyot['M'] = clone(special['M']);
     calculateNumVerses(aliyot['M']);
   }
 }
+
 /**
  * Determines if the regular parashat haShavua coincides with an event that requires
  * a special maftir or Haftara (for example Shabbat HaGadol, Shabbat Chanukah, Rosh
@@ -495,38 +433,32 @@ function mergeAliyotWithSpecial(aliyot, special) {
  * @param {boolean} [wantSeph]
  * @return {Aliyah | Aliyah[]}
  */
-
-
 function specialReadings(hd, il, aliyot, reason, parsha, wantSeph = false) {
   let haft;
   let seph;
   let specialHaft = false;
-  const parshaName = parsha ? parshaToString(parsha) : null; // eslint-disable-next-line require-jsdoc
+  const parshaName = parsha ? parshaToString(parsha) : null;
 
+  // eslint-disable-next-line require-jsdoc
   function handleSpecial(key) {
     const special = lookupFestival(key);
-
     if (!special) {
       return;
     }
-
     if (special.haft && !specialHaft) {
       haft = cloneHaftara(special.haft);
       reason.haftara = key;
       specialHaft = true;
-
       if (special.seph) {
         seph = cloneHaftara(special.seph);
         reason.sephardic = key;
       }
     }
-
     if (special.fullkriyah) {
       mergeAliyotWithSpecial(aliyot, special.fullkriyah);
       Object.keys(special.fullkriyah).map(k => reason[k] = key);
     }
   }
-
   const events0 = HebrewCalendar.getHolidaysOnDate(hd, il) || [];
   const events = events0.filter(ev => !(ev.getFlags() & flags.ROSH_CHODESH));
   events.forEach(ev => {
@@ -534,16 +466,13 @@ function specialReadings(hd, il, aliyot, reason, parsha, wantSeph = false) {
       handleSpecial(`Shabbat Shuva (with ${parshaName})`);
     } else {
       const key = getLeyningKeyForEvent(ev, il);
-
       if (key) {
         handleSpecial(key);
       }
     }
   });
-
   if (!haft) {
     const day = hd.getDate();
-
     if (parshaName === 'Pinchas' && day > 17) {
       // Pinchas is always read in Tamuz (never another month)
       // either on the 14, 16, 17 (in Israel), 19, 21, 23, 24
@@ -553,13 +482,11 @@ function specialReadings(hd, il, aliyot, reason, parsha, wantSeph = false) {
       handleSpecial(key);
     } else {
       const tommorow = hd.next().getDate();
-
       if (tommorow === 30 || tommorow === 1) {
         handleSpecial('Shabbat Machar Chodesh');
       }
     }
   }
-
   if (wantSeph && haft) {
     return {
       haft,
@@ -618,7 +545,6 @@ const Bereshit={num:1,hebrew:"בְּרֵאשִׁית",book:1,haft:{k:"Isaiah",b:
  * @param {boolean} [il] true if Israel holiday scheme
  * @return {Leyning} map of aliyot
  */
-
 function getLeyningForHoliday(ev, il = false) {
   if (typeof ev !== 'object' || !(ev instanceof Event)) {
     throw new TypeError(`Bad event argument: ${ev}`);
@@ -627,11 +553,11 @@ function getLeyningForHoliday(ev, il = false) {
   } else if (ev.getFlags() & HOLIDAY_IGNORE_MASK) {
     return undefined;
   }
-
   const key = getLeyningKeyForEvent(ev, il);
   const leyning = getLeyningForHolidayKey(key, ev.cholHaMoedDay);
   return leyning;
 }
+
 /**
  * Looks up leyning for a given holiday key. Key should be an
  * (untranslated) string used in holiday-readings.json. Returns some
@@ -640,62 +566,50 @@ function getLeyningForHoliday(ev, il = false) {
  * @param {number} [cholHaMoedDay]
  * @return {Leyning} map of aliyot
  */
-
 function getLeyningForHolidayKey(key, cholHaMoedDay) {
   if (typeof key !== 'string') {
     return undefined;
   }
-
   const src = lookupFestival(key);
-
   if (typeof src === 'undefined') {
     return undefined;
   }
-
   const leyning = {
     name: {
       en: key,
       he: Locale.lookupTranslation(key, 'he')
     }
   };
-
   if (src.fullkriyah) {
     leyning.fullkriyah = clone(src.fullkriyah);
-
     if (key === 'Sukkot Shabbat Chol ha-Moed' && cholHaMoedDay) {
       leyning.fullkriyah['M'] = leyning.fullkriyah[`M-day${cholHaMoedDay}`];
-
       for (let day = 1; day <= 5; day++) {
         delete leyning.fullkriyah[`M-day${day}`];
       }
     }
-
     if (typeof leyning.fullkriyah['1'] === 'object') {
       const parts = makeLeyningParts(leyning.fullkriyah);
       leyning.summary = makeSummaryFromParts(parts);
-
       if (parts.length > 1) {
         leyning.summaryParts = parts;
       }
     }
-
     Object.values(leyning.fullkriyah).map(aliyah => calculateNumVerses(aliyah));
   }
-
   if (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);
     leyning.sephardic = makeSummaryFromParts(seph);
     leyning.sephardicNumV = sumVerses(seph);
   }
-
   return leyning;
 }
+
 /**
  * on doubled parshiot, read only the second Haftarah
  * except for Nitzavim-Vayelech
@@ -703,7 +617,6 @@ function getLeyningForHolidayKey(key, cholHaMoedDay) {
  * @param {string[]} parsha
  * @return {string}
  */
-
 function getHaftaraKey(parsha) {
   if (parsha.length == 1 || parsha[0] == 'Nitzavim') {
     return parsha[0];
@@ -711,20 +624,17 @@ function getHaftaraKey(parsha) {
     return parsha[1];
   }
 }
+
 /**
  * Looks up regular leyning for a weekly parsha with no special readings
  * @param {string|string[]} parsha untranslated name like 'Pinchas' or ['Pinchas'] or ['Matot','Masei']
  * @return {Leyning} map of aliyot
  */
-
-
 function getLeyningForParsha(parsha) {
   const isParshaString = typeof parsha === 'string';
-
   if (!isParshaString && (!Array.isArray(parsha) || parsha.length !== 1 && parsha.length !== 2)) {
     throw new TypeError(`Bad parsha argument: ${parsha}`);
   }
-
   const name = isParshaString ? parsha : parshaToString(parsha);
   const raw = parshiyotObj[name];
   const fullkriyah = {};
@@ -743,7 +653,6 @@ function getLeyningForParsha(parsha) {
   const parts = makeLeyningParts(fullkriyah);
   const summary = makeSummaryFromParts(parts);
   /** @type {Leyning} */
-
   const result = {
     name: {
       en: name,
@@ -754,28 +663,22 @@ function getLeyningForParsha(parsha) {
     summary,
     fullkriyah: fullkriyah
   };
-
   if (parts.length > 1) {
     result.summaryParts = parts;
   }
-
   const hkey = getHaftaraKey(parshaNameArray);
   const haft0 = parshiyotObj[hkey].haft;
-
   if (haft0) {
     const haft = result.haft = cloneHaftara(haft0);
     result.haftara = makeSummaryFromParts(haft);
     result.haftaraNumV = sumVerses(haft);
   }
-
   if (raw.seph) {
     const seph = result.seph = cloneHaftara(raw.seph);
     result.sephardic = makeSummaryFromParts(seph);
     result.sephardicNumV = sumVerses(seph);
   }
-
   const weekdaySrc = raw.weekday || parshiyotObj[parshaNameArray[0]].weekday;
-
   if (weekdaySrc) {
     const weekday = result.weekday = {};
     ['1', '2', '3'].forEach(num => {
@@ -789,9 +692,9 @@ function getLeyningForParsha(parsha) {
       weekday[num] = aliyah;
     });
   }
-
   return result;
 }
+
 /**
  * Looks up leyning for a regular Shabbat parsha, including any special
  * maftir or Haftara.
@@ -799,42 +702,35 @@ function getLeyningForParsha(parsha) {
  * @param {boolean} [il] in Israel
  * @return {Leyning} map of aliyot
  */
-
 function getLeyningForParshaHaShavua(ev, il = false) {
   if (!ev instanceof Event) {
     throw new TypeError(`Bad event argument: ${ev}`);
   } else if (ev.getFlags() != flags.PARSHA_HASHAVUA) {
     throw new TypeError(`Event must be parsha hashavua: ${ev.getDesc()}`);
-  } // first, collect the default aliyot and haftara
-
-
+  }
+  // first, collect the default aliyot and haftara
   const parsha = ev.parsha;
   const result = getLeyningForParsha(parsha);
   const reason = {};
-  const hd = ev.getDate(); // Now, check for special maftir or haftara on same date
-
+  const hd = ev.getDate();
+  // Now, check for special maftir or haftara on same date
   const specialHaftara = specialReadings(hd, il, result.fullkriyah, reason, parsha, true);
-
   if (specialHaftara) {
     const haft = result.haft = cloneHaftara(specialHaftara.haft);
     result.haftara = makeSummaryFromParts(haft);
     result.haftaraNumV = sumVerses(haft);
-
     if (specialHaftara.seph) {
       const seph = result.seph = cloneHaftara(specialHaftara.seph);
       result.sephardic = makeSummaryFromParts(seph);
       result.sephardicNumV = sumVerses(seph);
     }
   }
-
   if (reason['7'] || reason['M']) {
     const parts = makeLeyningParts(result.fullkriyah);
     result.summary = makeSummaryFromParts(parts);
     result.summaryParts = parts;
   }
-
   const reasons = Object.keys(reason);
-
   if (reasons.length !== 0) {
     result.reason = reason;
     reasons.forEach(num => {
@@ -844,18 +740,17 @@ function getLeyningForParshaHaShavua(ev, il = false) {
         hafts.forEach(haft => haft.reason = reason[num]);
       } else {
         const aliyah = result.fullkriyah[num];
-
         if (typeof aliyah === 'object') {
           aliyah.reason = reason[num];
         }
       }
     });
-  } // to avoid confusion, don't include Saturday mincha reading here
-
-
+  }
+  // to avoid confusion, don't include Saturday mincha reading here
   delete result.weekday;
   return result;
 }
+
 /**
  * Looks up leyning for a regular Shabbat, Monday/Thursday weekday or holiday.
  *
@@ -873,28 +768,22 @@ function getLeyningForParshaHaShavua(ev, il = false) {
  * @param {boolean} il in Israel
  * @return {Leyning} map of aliyot
  */
-
 function getLeyningOnDate(hdate, il) {
   const dow = hdate.getDay();
   const hyear = hdate.getFullYear();
   const sedra = HebrewCalendar.getSedra(hyear, il);
   const parsha = sedra.lookup(hdate);
-
   if (dow === 6 && !parsha.chag) {
     const parshaEvent = new ParshaEvent(hdate, parsha.parsha, il);
     return getLeyningForParshaHaShavua(parshaEvent, il);
   }
-
   const events = HebrewCalendar.getHolidaysOnDate(hdate, il) || [];
-
   for (let i = 0; i < events.length; i++) {
     const reading = getLeyningForHoliday(events[i], il);
-
     if (reading) {
       return reading;
     }
   }
-
   if (dow === 1 || dow === 4) {
     const saturday = hdate.onOrAfter(6);
     const parsha2 = findParshaHaShavua(saturday);
@@ -906,44 +795,38 @@ function getLeyningOnDate(hdate, il) {
       weekday: reading.weekday
     };
     return result;
-  } // no reading today: it's not Shabbat, Mon/Thu, or a Torah-reading holiday
-
-
+  }
+  // no reading today: it's not Shabbat, Mon/Thu, or a Torah-reading holiday
   return undefined;
 }
+
 /**
  * @private
  * @param {HDate} saturday
  * @param {boolean} il
  * @return {Leyning}
  */
-
 function findParshaHaShavua(saturday, il) {
   const hyear = saturday.getFullYear();
   const sedra = HebrewCalendar.getSedra(hyear, il);
   const parsha = sedra.lookup(saturday);
-
   if (!parsha.chag) {
     return parsha;
-  } // Search for next regular parsha, which could even spill into next year
-
-
+  }
+  // Search for next regular parsha, which could even spill into next year
   const endOfYear = new HDate(1, months.TISHREI, hyear + 1).abs() - 1;
   const endAbs = endOfYear + 30;
-
   for (let sat2 = saturday.abs() + 7; sat2 <= endAbs; sat2 += 7) {
     const sedra2 = sat2 > endOfYear ? HebrewCalendar.getSedra(hyear + 1, il) : sedra;
     const parsha2 = sedra2.lookup(sat2);
-
     if (!parsha2.chag) {
       return parsha2;
     }
   }
   /* NOTREACHED */
-
-
   return null;
 }
+
 /**
  * Parsha metadata
  * @typedef {Object} ParshaMeta
@@ -962,22 +845,16 @@ function findParshaHaShavua(saturday, il) {
  * @param {string|string[]} parsha
  * @return {ParshaMeta}
  */
-
-
 function lookupParsha(parsha) {
   const isParshaString = typeof parsha === 'string';
-
   if (!isParshaString && (!Array.isArray(parsha) || parsha.length !== 1 && parsha.length !== 2)) {
     throw new TypeError(`Bad parsha argument: ${parsha}`);
   }
-
   const name = isParshaString ? parsha : parshaToString(parsha);
   const raw = parshiyotObj[name];
-
   if (typeof raw !== 'object') {
     throw new TypeError(`Bad parsha argument: ${parsha}`);
   }
-
   return raw;
 }
 
@@ -986,23 +863,22 @@ const fmt = new Intl.DateTimeFormat('en-US', {
   month: 'short',
   day: '2-digit'
 });
+
 /**
  * @private
  * @param {Date} dt
  * @return {string}
  */
-
 function fmtDate(dt) {
   const s = fmt.format(dt).split(' ');
   return s[1].substring(0, 2) + '-' + s[0] + '-' + s[2];
 }
+
 /**
  * @private
  * @param {Event[]} events
  * @return {Object<string,boolean>}
  */
-
-
 function getParshaDates(events) {
   const parshaEvents = events.filter(ev => ev.getFlags() === flags.PARSHA_HASHAVUA);
   const parshaDates = parshaEvents.reduce((set, ev) => {
@@ -1011,13 +887,13 @@ function getParshaDates(events) {
   }, {});
   return parshaDates;
 }
+
 /**
  * @private
  * @param {fs.WriteStream} stream
  * @param {number} hyear
  * @param {boolean} il
  */
-
 function writeFullKriyahCsv(stream, hyear, il) {
   const events0 = HebrewCalendar.calendar({
     year: hyear,
@@ -1034,68 +910,61 @@ function writeFullKriyahCsv(stream, hyear, il) {
     }
   });
 }
+
 /**
  * @private
  * @param {Event} ev
  * @return {boolean}
  */
-
 function ignore(ev) {
   const mask = ev.getFlags();
-
   if (mask === flags.SPECIAL_SHABBAT) {
     return true;
   }
-
   if (mask !== flags.ROSH_CHODESH) {
     return false;
   }
-
   return ev.getDate().getDay() === 6;
 }
+
 /**
  * @private
  * @param {fs.WriteStream} stream
  * @param {Event} ev
  * @param {boolean} il
  */
-
-
 function writeFullKriyahEvent(stream, ev, il) {
   if (ignore(ev)) {
     return;
   }
-
   const mask = ev.getFlags();
   const isParsha = mask === flags.PARSHA_HASHAVUA;
   const reading = isParsha ? getLeyningForParshaHaShavua(ev, il) : getLeyningForHoliday(ev, il);
-
   if (reading) {
     writeCsvLines(stream, ev, reading, il, isParsha);
-
     if (!isParsha) {
       writeHolidayMincha(stream, ev, il);
     }
   }
 }
+
 /**
  * @private
  * @param {fs.WriteStream} stream
  * @param {Event} ev
  * @param {boolean} il
  */
-
 function writeHolidayMincha(stream, ev, il) {
   const desc = ev.getDesc();
   const minchaDesc1 = desc + ' (Mincha)';
   const readingMincha1 = getLeyningForHolidayKey(minchaDesc1);
   const readingMincha = readingMincha1 || getLeyningForHolidayKey(getLeyningKeyForEvent(ev, il) + ' (Mincha)');
-
   if (readingMincha) {
     const minchaEv = new Event(ev.getDate(), minchaDesc1, flags.USER_EVENT);
     writeCsvLines(stream, minchaEv, readingMincha, il, false);
   }
 }
+
 /**
  * Formats reading for CSV
  * @param {fs.WriteStream} stream
@@ -1104,75 +973,59 @@ function writeHolidayMincha(stream, ev, il) {
  * @param {boolean} il
  * @param {boolean} isParsha
  */
-
 function writeCsvLines(stream, ev, reading, il, isParsha) {
   const parsha = isParsha ? ev.basename() : getLeyningKeyForEvent(ev, il) || ev.render();
   const date = fmtDate(ev.getDate().greg());
   const lines = getFullKriyahLines(reading);
   lines.forEach(s => {
     const code = s[0].charCodeAt(0);
-
     if (code < 48 || code > 57) {
       s[0] = `"${s[0]}"`;
     }
-
     stream.write(`${date},"${parsha}",${s[0]},"${s[1]}",${s[2]}\r\n`);
   });
   stream.write('\r\n');
 }
+
 /**
  * @private
  * @param {any} reading
  * @return {any[]}
  */
-
 function getFullKriyahLines(reading) {
   const lines = [];
-
   if (reading.fullkriyah) {
     Object.keys(reading.fullkriyah).forEach(num => {
       const a = reading.fullkriyah[num];
-
       if (typeof a !== 'undefined') {
         var _reading$reason;
-
         const k = num == 'M' ? 'maf' : num;
         let aliyah = formatAliyahWithBook(a);
-
         if ((_reading$reason = reading.reason) !== null && _reading$reason !== void 0 && _reading$reason[num]) {
           aliyah += ' | ' + reading.reason[num];
         }
-
         lines.push([k, aliyah, a.v || '']);
       }
     });
   }
-
   let specialHaftara = false;
-
   if (reading.haftara) {
     var _reading$reason2;
-
     let haftara = reading.haftara.replace(/,/g, ';');
-
     if ((_reading$reason2 = reading.reason) !== null && _reading$reason2 !== void 0 && _reading$reason2.haftara) {
       specialHaftara = true;
       haftara += ' | ' + reading.reason.haftara;
     }
-
     lines.push(['Haftara', haftara, reading.haftaraNumV || '']);
   }
-
   if (reading.sephardic && !specialHaftara) {
     const sephardic = reading.sephardic.replace(/,/g, ';');
     lines.push(['Haftara for Sephardim', sephardic, reading.sephardicNumV || '']);
   }
-
   if (reading.triHaftara) {
     const haftara = reading.triHaftara.replace(/,/g, ';');
     lines.push(['Alternate Haftara', haftara, reading.triHaftaraNumV || '']);
   }
-
   return lines;
 }