@hebcal/leyning 9.0.5 → 9.1.0

package/dist/bundle.js

@@ -1,4 +1,4 @@
-/*! @hebcal/leyning v9.0.5 */
+/*! @hebcal/leyning v9.1.0 */
 var hebcal__leyning = (function (exports, locale, event, holidays, sedra, ParshaEvent) {
 'use strict';
 
@@ -17,7 +17,7 @@ const poHeNoNikud$1 = {
 };
 locale.Locale.addTranslations('he-x-NoNikud', poHeNoNikud$1);
 
-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 Esther=[0,22,23,15,17,14,14,10,17,32,3];const Ecclesiastes=[0,18,26,22,17,19,12,29,17,18,20,10,14];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,Esther:Esther,Ecclesiastes:Ecclesiastes,"Song of Songs":[0,17,17,11,16,16,12,14,14],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};
+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,23,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 Esther=[0,22,23,15,17,14,14,10,17,32,3];const Ecclesiastes=[0,18,26,22,17,19,12,29,17,18,20,10,14];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,Esther:Esther,Ecclesiastes:Ecclesiastes,"Song of Songs":[0,17,17,11,16,16,12,14,14],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};
 
 /**
  * Names of the books of the Torah. BOOK[1] === 'Genesis'
@@ -64,28 +64,65 @@ function calculateNumVerses(aliyah) {
     if (aliyah.v) {
         return aliyah.v;
     }
-    const chapVerseBegin = aliyah.b.split(':');
-    const chapVerseEnd = aliyah.e.split(':');
+    aliyah.v = subtractVerses(aliyah.k, aliyah.b, aliyah.e) + 1;
+    return aliyah.v;
+}
+/**
+ * Finds the number of verses between two locations in the same book.
+ * @param book The English name of the book (e.g. "Numbers")
+ * @param from The starting verse (e.g. "28:9")
+ * @param to The ending verse (e.g. "28:15")
+ * @returns The number of verses between the two locations, excluding the `to` verse.
+ */
+function subtractVerses(book, from, to) {
+    const chapVerseBegin = from.split(':');
+    const chapVerseEnd = to.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);
+    let result = 0;
     if (c1 === c2) {
-        aliyah.v = v2 - v1 + 1;
+        return v2 - v1;
     }
-    else if (typeof aliyah.k === 'string') {
-        const numv = NUM_VERSES[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;
+    const numv = NUM_VERSES[book];
+    if (typeof numv !== 'object' || !numv.length) {
+        throw new ReferenceError(`Can't find numverses for ${book}`);
     }
-    return aliyah.v;
+    let total = numv[c1] - v1;
+    for (let chap = c1 + 1; chap < c2; chap++) {
+        total += numv[chap];
+    }
+    total += v2;
+    result = total;
+    return result;
+}
+/**
+ * Calculates the next verse after adding a number of verses to a given location.
+ * @param book The English name of the book (e.g. "Numbers")
+ * @param from The starting verse (e.g. "28:9")
+ * @param numVerses The number of verses to add; must be nonnegative.
+ * @returns The next verse after adding the specified number of verses,
+ *          or null if the resulting verse exceeds the number of verses
+ *          in the book.
+ */
+function addVerses(book, from, numVerses) {
+    const chapVerseBegin = from.split(':');
+    const c1 = parseInt(chapVerseBegin[0], 10);
+    const v1 = parseInt(chapVerseBegin[1], 10);
+    const numv = NUM_VERSES[book];
+    if (typeof numv !== 'object' || !numv.length) {
+        throw new ReferenceError(`Can't find numverses for ${book}`);
+    }
+    let total = v1 + numVerses;
+    let c2 = c1;
+    while (total > numv[c2]) {
+        total -= numv[c2];
+        c2++;
+        if (!numv[c2])
+            return null;
+    }
+    return `${c2}:${total}`;
 }
 /**
  * Formats an aliyah object like "Numbers 28:9-28:15"
@@ -254,7 +291,7 @@ function lookupFestival(holiday) {
     return result;
 }
 
-/*! @hebcal/hdate v0.13.5, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/hdate v0.14.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 /* eslint-disable @typescript-eslint/no-namespace, no-inner-declarations */
 /** @private */
 const lengths = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
@@ -343,6 +380,9 @@ function greg2abs(date) {
     if (!isDate(date)) {
         throw new TypeError(`not a Date: ${date}`);
     }
+    else if (isNaN(date.getTime())) {
+        throw new RangeError('Invalid Date');
+    }
     const abs = toFixed(date.getFullYear(), date.getMonth() + 1, date.getDate());
     /*
       if (abs < ABS_14SEP1752 && abs > ABS_2SEP1752) {
@@ -371,7 +411,7 @@ function greg2abs(date) {
  * const day = date.getDate(); // 13
  */
 function abs2greg(abs) {
-    if (typeof abs !== 'number') {
+    if (typeof abs !== 'number' || isNaN(abs)) {
         throw new TypeError(`not a Number: ${abs}`);
     }
     abs = Math.trunc(abs);
@@ -392,7 +432,7 @@ function abs2greg(abs) {
     return dt;
 }
 
-/*! @hebcal/hdate v0.13.5, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/hdate v0.14.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 
 /* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-namespace */
 /**
@@ -407,7 +447,7 @@ greg.greg2abs = greg2abs;
 greg.isDate = isDate;
 greg.isLeapYear = isGregLeapYear;
 
-/*! @hebcal/hdate v0.13.5, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/hdate v0.14.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 /*
  * More minimal HDate
  */
@@ -773,7 +813,7 @@ function monthFromName(monthName) {
     throw new RangeError(`bad monthName: ${monthName}`);
 }
 
-/*! @hebcal/hdate v0.13.5, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/hdate v0.14.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 const GERESH = '׳';
 const GERSHAYIM = '״';
 const heb2num = {
@@ -886,13 +926,13 @@ function gematriyaStrToNum(str) {
     return num;
 }
 
-/*! @hebcal/hdate v0.13.5, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/hdate v0.14.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 var poAshkenazi = { "headers": { "plural-forms": "nplurals=2; plural=(n > 1);", "language": "en_CA@ashkenazi" }, "contexts": { "": { "Tevet": ["Teves"] } } };
 
-/*! @hebcal/hdate v0.13.5, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/hdate v0.14.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 var poHe = { "headers": { "plural-forms": "nplurals=2; plural=(n > 1);", "language": "he" }, "contexts": { "": { "Adar": ["אַדָר"], "Adar I": ["אַדָר א׳"], "Adar II": ["אַדָר ב׳"], "Av": ["אָב"], "Cheshvan": ["חֶשְׁוָן"], "Elul": ["אֱלוּל"], "Iyyar": ["אִיָיר"], "Kislev": ["כִּסְלֵו"], "Nisan": ["נִיסָן"], "Sh'vat": ["שְׁבָט"], "Sivan": ["סִיוָן"], "Tamuz": ["תַּמּוּז"], "Tevet": ["טֵבֵת"], "Tishrei": ["תִּשְׁרֵי"] } } };
 
-/*! @hebcal/hdate v0.13.5, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/hdate v0.14.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 
 const noopLocale = {
     headers: { 'plural-forms': 'nplurals=2; plural=(n!=1);' },
@@ -1102,7 +1142,7 @@ const poHeNoNikud = {
 };
 Locale.addLocale('he-x-NoNikud', poHeNoNikud);
 
-/*! @hebcal/hdate v0.13.5, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
+/*! @hebcal/hdate v0.14.0, distributed under GPLv2 https://www.gnu.org/licenses/gpl-2.0.txt */
 
 /*
     Hebcal - A Jewish Calendar Generator
@@ -2160,9 +2200,7 @@ function getLeyningForHolidayKey(key, cholHaMoedDay, il) {
         if (typeof leyning.fullkriyah['1'] === 'object') {
             const parts = makeLeyningParts(leyning.fullkriyah);
             leyning.summary = makeSummaryFromParts(parts);
-            if (parts.length > 1) {
-                leyning.summaryParts = parts;
-            }
+            leyning.summaryParts = parts;
         }
         Object.values(leyning.fullkriyah).map(aliyah => calculateNumVerses(aliyah));
     }
@@ -2187,9 +2225,14 @@ function getLeyningForHolidayKey(key, cholHaMoedDay, il) {
             m[`${i}`] = { k: megillah, b: `${i}:1`, e: `${i}:${numv}`, v: numv };
         }
         leyning.megillah = m;
+        const parts = makeLeyningParts(m);
+        if (leyning.summaryParts) {
+            leyning.summaryParts.push(...parts);
+        }
+        const megillahSummary = makeSummaryFromParts(parts);
         leyning.summary = leyning.summary
-            ? leyning.summary + '; ' + megillah
-            : megillah;
+            ? leyning.summary + '; ' + megillahSummary
+            : megillahSummary;
     }
     if (src.note) {
         leyning.note = src.note;
@@ -2546,6 +2589,7 @@ get: function () { return locale.Locale; }
 });
 exports.BOOK = BOOK;
 exports.NUM_VERSES = NUM_VERSES;
+exports.addVerses = addVerses;
 exports.calculateNumVerses = calculateNumVerses;
 exports.clone = clone;
 exports.cloneHaftara = cloneHaftara;
@@ -2567,6 +2611,7 @@ exports.makeLeyningSummary = makeLeyningSummary;
 exports.makeSummaryFromParts = makeSummaryFromParts;
 exports.parshaToString = parshaToString;
 exports.specialReadings2 = specialReadings2;
+exports.subtractVerses = subtractVerses;
 exports.sumVerses = sumVerses;
 
 return exports;