@hebcal/leyning 8.0.0 → 8.1.0

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/leyning v8.0.0 */
+/*! @hebcal/leyning v8.1.0 */
 'use strict';
 
 var core = require('@hebcal/core');
@@ -263,11 +263,11 @@ function lookupFestival(holiday) {
   }
   const result = src.fullkriyah ? clone(src) : src;
   if (result.fullkriyah) {
-    Object.values(result.fullkriyah).forEach(aliyah => {
+    for (const aliyah of Object.values(result.fullkriyah)) {
       if (typeof aliyah.k === 'number') {
         aliyah.k = BOOK[aliyah.k];
       }
-    });
+    }
   }
   if (src.note) {
     result.note = src.note;
@@ -310,32 +310,23 @@ function getLeyningKeyForEvent(ev, il = false) {
     }
     return desc;
   }
+  const cholHaMoedDay = ev.cholHaMoedDay;
   if (day == 1 && month === core.months.TISHREI) {
     return isShabbat ? 'Rosh Hashana I (on Shabbat)' : 'Rosh Hashana I';
-  } else if (ev.cholHaMoedDay) {
+  } else if (cholHaMoedDay) {
     // Sukkot or Pesach
     if (isShabbat) {
       return holiday + ' Shabbat Chol ha-Moed';
     } else if (desc == 'Sukkot VII (Hoshana Raba)') {
       return 'Sukkot Final Day (Hoshana Raba)';
     }
-    if (isPesach && ev.cholHaMoedDay) {
+    if (isPesach && cholHaMoedDay) {
       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)') {
         return 'Pesach Chol ha-Moed Day 3 on Monday';
       }
     }
-    // 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;
-      } else if (dow == 1 && cholHaMoedDay == 5) {
-        cholHaMoedDay = 4;
-      }
-    }
     return `${holiday} Chol ha-Moed Day ${cholHaMoedDay}`;
   } else if (ev.chanukahDay) {
     if (isShabbat && isRoshChodesh) {
@@ -391,7 +382,6 @@ function getLeyningKeyForEvent(ev, il = false) {
       return 'Chanukah Day 7 (on Rosh Chodesh)'; // 1st of Tevet
     }
   }
-
   if (isRoshChodesh) {
     return desc;
   }
@@ -493,14 +483,16 @@ function specialReadings2(parsha, hd, il, aliyot) {
     if (special.fullkriyah) {
       const aliyotMap = clone(aliyot);
       mergeAliyotWithSpecial(aliyotMap, special.fullkriyah);
-      Object.keys(special.fullkriyah).map(k => reason[k] = key);
+      for (const num of Object.keys(special.fullkriyah)) {
+        reason[num] = key;
+      }
       aliyot = aliyotMap;
     }
   }
   const parshaName = parshaToString(parsha);
   const events0 = core.HebrewCalendar.getHolidaysOnDate(hd, il) || [];
   const events = events0.filter(ev => !(ev.getFlags() & core.flags.ROSH_CHODESH));
-  events.forEach(ev => {
+  for (const ev of events) {
     if (ev.getDesc() === 'Shabbat Shuva') {
       handleSpecial(`Shabbat Shuva (with ${parshaName})`);
     } else {
@@ -509,7 +501,7 @@ function specialReadings2(parsha, hd, il, aliyot) {
         handleSpecial(key);
       }
     }
-  });
+  }
   if (!haft) {
     const day = hd.getDate();
     if (parshaName === 'Pinchas' && day > 17) {
@@ -667,7 +659,7 @@ const Bereshit={num:1,hebrew:"בְּרֵאשִׁית",book:1,haft:{k:"Isaiah",b:
  * @property {LeyningNames} name
  * @property {string[]} [parsha] - An array of either 1 (regular) or 2 (doubled parsha).
  *    `undefined` for holiday readings
- * @property {number} [parshaNum] - 1 for Bereshit, 2 for Noach, etc. `undefined` for holiday readings
+ * @property {number|number[]} [parshaNum] - 1 for Bereshit, 2 for Noach, etc. `undefined` for holiday readings
  * @property {string} summary - Such as `Genesis 1:1 - 6:8`
  * @property {Aliyah|Aliyah[]} haft - Haftarah object(s)
  * @property {string} haftara - Haftarah, such as `Isaiah 42:5 – 43:11`
@@ -701,6 +693,19 @@ function getHaftaraKey(parsha) {
   }
 }
 
+/**
+ * Transliterated English and Hebrew names of this parsha
+ * @param {string|string[]} parsha untranslated name like 'Pinchas' or ['Pinchas'] or ['Matot','Masei']
+ * @return {LeyningNames}
+ */
+function makeLeyningNames(parsha) {
+  const name = parshaToString(parsha);
+  return {
+    en: name,
+    he: parsha.map(s => core.Locale.lookupTranslation(s, 'he')).join('־')
+  };
+}
+
 /**
  * Looks up regular leyning for a weekly parsha with no special readings
  * @private
@@ -711,26 +716,22 @@ function getLeyningForParshaShabbatOnly(parsha) {
   const raw = lookupParsha(parsha);
   const fullkriyah = {};
   const book = BOOK[raw.book];
-  Object.keys(raw.fullkriyah).forEach(num => {
-    const src = raw.fullkriyah[num];
-    const reading = {
+  for (const [num, src] of Object.entries(raw.fullkriyah)) {
+    const aliyah = {
       k: book,
       b: src[0],
       e: src[1]
     };
-    fullkriyah[num] = reading;
-  });
-  Object.values(fullkriyah).map(aliyah => calculateNumVerses(aliyah));
+    calculateNumVerses(aliyah);
+    fullkriyah[num] = aliyah;
+  }
   const name = parshaToString(parsha);
   const parshaNameArray = raw.combined ? [raw.p1, raw.p2] : [name];
   const parts = makeLeyningParts(fullkriyah);
   const summary = makeSummaryFromParts(parts);
   /** @type {Leyning} */
   const result = {
-    name: {
-      en: name,
-      he: parshaNameArray.map(s => core.Locale.lookupTranslation(s, 'he')).join('־')
-    },
+    name: makeLeyningNames(parshaNameArray),
     parsha: parshaNameArray,
     parshaNum: raw.num,
     summary,
@@ -832,18 +833,20 @@ function getLeyningForParshaHaShavua(ev, il = false) {
   const reasons = Object.keys(reason);
   if (reasons.length !== 0) {
     result.reason = reason;
-    reasons.forEach(num => {
+    for (const num of reasons) {
       if (num === 'haftara' || num === 'sephardic') {
         const haftObj = result[num === 'haftara' ? 'haft' : 'seph'];
         const hafts = Array.isArray(haftObj) ? haftObj : [haftObj];
-        hafts.forEach(haft => haft.reason = reason[num]);
+        for (const haft of hafts) {
+          haft.reason = reason[num];
+        }
       } else {
         const aliyah = result.fullkriyah[num];
         if (typeof aliyah === 'object') {
           aliyah.reason = reason[num];
         }
       }
-    });
+    }
   }
   return result;
 }
@@ -888,6 +891,18 @@ function findParshaHaShavua(saturday, il) {
   if (!parsha.chag) {
     return parsha;
   }
+  // Special case between YK and Simchat Torah
+  if (saturday.getMonth() === core.months.TISHREI) {
+    const dd = saturday.getDate();
+    const simchatTorah = il ? 22 : 23;
+    if (dd > 10 && dd <= simchatTorah) {
+      return {
+        parsha: ['Vezot Haberakhah'],
+        chag: false,
+        num: 54
+      };
+    }
+  }
   // Search for next regular parsha, which could even spill into next year
   const endOfYear = new core.HDate(1, core.months.TISHREI, hyear + 1).abs() - 1;
   const endAbs = endOfYear + 30;
@@ -922,48 +937,44 @@ function findParshaHaShavua(saturday, il) {
  */
 function getLeyningOnDate(hdate, il, wantarray = false) {
   const dow = hdate.getDay();
-  const hyear = hdate.getFullYear();
-  const sedra = core.HebrewCalendar.getSedra(hyear, il);
-  const parsha = sedra.lookup(hdate);
-  if (dow === 6 && !parsha.chag) {
-    const parshaEvent = new core.ParshaEvent(hdate, parsha.parsha, il);
-    const reading = getLeyningForParshaHaShavua(parshaEvent, il);
-    return wantarray ? [reading] : reading;
+  if (dow === 6) {
+    const hyear = hdate.getFullYear();
+    const sedra = core.HebrewCalendar.getSedra(hyear, il);
+    const parsha = sedra.lookup(hdate);
+    if (!parsha.chag) {
+      const parshaEvent = new core.ParshaEvent(hdate, parsha.parsha, il);
+      const reading = getLeyningForParshaHaShavua(parshaEvent, il);
+      return wantarray ? [reading] : reading;
+    }
   }
   const events = core.HebrewCalendar.getHolidaysOnDate(hdate, il) || [];
   const arr = [];
-  for (let i = 0; i < events.length; i++) {
-    const ev = events[i];
+  let hasFullKriyah = false;
+  for (const ev of events) {
     const reading = getLeyningForHoliday(ev, il);
     if (reading) {
-      if (wantarray) {
-        arr.push(reading);
-        const mincha = getMincha(ev, il);
-        if (mincha) {
-          arr.push(mincha);
-        }
-      } else {
-        return reading;
+      arr.push(reading);
+      if (reading.fullkriyah) {
+        hasFullKriyah = true;
+      }
+      const mincha = getMincha(ev, il);
+      if (mincha) {
+        arr.push(mincha);
       }
     }
   }
-  if (wantarray && arr.length !== 0) {
-    return arr;
-  }
-  if (dow === 1 || dow === 4) {
+  if (!hasFullKriyah && (dow === 1 || dow === 4)) {
     const saturday = hdate.onOrAfter(6);
-    const parsha2 = findParshaHaShavua(saturday);
-    const reading = getLeyningForParsha(parsha2.parsha);
-    const result = {
-      name: reading.name,
-      parsha: reading.parsha,
-      parshaNum: reading.parshaNum,
-      weekday: reading.weekday
+    const parsha = findParshaHaShavua(saturday);
+    const reading = {
+      name: makeLeyningNames(parsha.parsha),
+      parsha: parsha.parsha,
+      parshaNum: parsha.num,
+      weekday: getWeekdayReading(parsha.parsha)
     };
-    return wantarray ? [result] : result;
+    arr.unshift(reading);
   }
-  // no reading today: it's not Shabbat, Mon/Thu, or a Torah-reading holiday
-  return wantarray ? [] : undefined;
+  return wantarray ? arr : arr[0];
 }
 const minchaSuffix = ' (Mincha)';
 
@@ -1035,11 +1046,11 @@ function writeFullKriyahCsv(stream, hyear, il) {
   const events = events0.filter(ev => ev.getDesc() !== 'Rosh Chodesh Tevet');
   const parshaDates = getParshaDates(events);
   stream.write('"Date","Parashah","Aliyah","Reading","Verses"\r\n');
-  events.forEach(ev => {
+  for (const ev of events) {
     if (ev.getFlags() === core.flags.PARSHA_HASHAVUA || !parshaDates[ev.getDate().toString()]) {
       writeFullKriyahEvent(stream, ev, il);
     }
-  });
+  }
 }
 
 /**
@@ -1108,13 +1119,13 @@ 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 => {
+  for (const s of lines) {
     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');
 }
 
@@ -1126,8 +1137,7 @@ function writeCsvLines(stream, ev, reading, il, isParsha) {
 function getFullKriyahLines(reading) {
   const lines = [];
   if (reading.fullkriyah) {
-    Object.keys(reading.fullkriyah).forEach(num => {
-      const a = reading.fullkriyah[num];
+    for (const [num, a] of Object.entries(reading.fullkriyah)) {
       if (typeof a !== 'undefined') {
         var _reading$reason;
         const k = num == 'M' ? 'maf' : num;
@@ -1137,7 +1147,7 @@ function getFullKriyahLines(reading) {
         }
         lines.push([k, aliyah, a.v || '']);
       }
-    });
+    }
   }
   let specialHaftara = false;
   if (reading.haftara) {
@@ -1158,13 +1168,12 @@ function getFullKriyahLines(reading) {
     lines.push(['Alternate Haftara', haftara, reading.triHaftaraNumV || '']);
   }
   if (reading.megillah) {
-    Object.keys(reading.megillah).forEach(num => {
-      const a = reading.megillah[num];
+    for (const [num, a] of Object.entries(reading.megillah)) {
       if (typeof a !== 'undefined') {
         const aliyah = formatAliyahWithBook(a);
         lines.push([`Megillah Ch. ${num}`, aliyah, a.v || '']);
       }
-    });
+    }
   }
   return lines;
 }
@@ -1186,6 +1195,7 @@ exports.getWeekdayReading = getWeekdayReading;
 exports.hasFestival = hasFestival;
 exports.lookupFestival = lookupFestival;
 exports.lookupParsha = lookupParsha;
+exports.makeLeyningNames = makeLeyningNames;
 exports.makeLeyningParts = makeLeyningParts;
 exports.makeLeyningSummary = makeLeyningSummary;
 exports.makeSummaryFromParts = makeSummaryFromParts;