Fix Mon/Thu weekday reading that coincides with Erev.

Now that we are really targeting modern ES6 syntax, more freely use iterators, replacing some use of Array.forEach()

README.md

@@ -108,6 +108,9 @@ of full kriyah aliyot, special Maftir, special Haftarah</p>
 <dd><p>Looks up leyning for a given holiday. Returns some
 of full kriyah aliyot, special Maftir, special Haftarah</p>
 </dd>
+<dt><a href="#makeLeyningNames">makeLeyningNames(parsha)</a> ⇒ <code><a href="#LeyningNames">LeyningNames</a></code></dt>
+<dd><p>Transliterated English and Hebrew names of this parsha</p>
+</dd>
 <dt><a href="#getWeekdayReading">getWeekdayReading(parsha)</a> ⇒ <code>Object.&lt;string, Aliyah&gt;</code></dt>
 <dd><p>Looks up Monday/Thursday aliyot for a regular parsha</p>
 </dd>
@@ -357,6 +360,17 @@ of full kriyah aliyot, special Maftir, special Haftarah
 | ev | <code>Event</code> |  | the Hebcal event associated with this leyning |
 | [il] | <code>boolean</code> | <code>false</code> | true if Israel holiday scheme |
 
+<a name="makeLeyningNames"></a>
+
+## makeLeyningNames(parsha) ⇒ [<code>LeyningNames</code>](#LeyningNames)
+Transliterated English and Hebrew names of this parsha
+
+**Kind**: global function  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| parsha | <code>string</code> \| <code>Array.&lt;string&gt;</code> | untranslated name like 'Pinchas' or ['Pinchas'] or ['Matot','Masei'] |
+
 <a name="getWeekdayReading"></a>
 
 ## getWeekdayReading(parsha) ⇒ <code>Object.&lt;string, Aliyah&gt;</code>
@@ -501,7 +515,7 @@ Leyning for a parsha hashavua or holiday
 | --- | --- | --- |
 | name | [<code>LeyningNames</code>](#LeyningNames) |  |
 | [parsha] | <code>Array.&lt;string&gt;</code> | An array of either 1 (regular) or 2 (doubled parsha).    `undefined` for holiday readings |
-| [parshaNum] | <code>number</code> | 1 for Bereshit, 2 for Noach, etc. `undefined` for holiday readings |
+| [parshaNum] | <code>number</code> \| <code>Array.&lt;number&gt;</code> | 1 for Bereshit, 2 for Noach, etc. `undefined` for holiday readings |
 | summary | <code>string</code> | Such as `Genesis 1:1 - 6:8` |
 | haft | [<code>Aliyah</code>](#Aliyah) \| [<code>Array.&lt;Aliyah&gt;</code>](#Aliyah) | Haftarah object(s) |
 | haftara | <code>string</code> | Haftarah, such as `Isaiah 42:5 – 43:11` |

leyning.d.ts

@@ -28,17 +28,26 @@ declare module '@hebcal/leyning' {
         [key: string]: Aliyah;
     }
 
+    /** Name of the parsha hashavua or holiday */
+    export type LeyningNames = {
+        /** English */
+        en: string;
+        /** Hebrew (with nikud) */
+        he: string;
+    }
+
+    /**
+     * Transliterated English and Hebrew names of this parsha
+     * @param parsha untranslated name like 'Pinchas' or ['Pinchas'] or ['Matot','Masei']
+     */
+    export function makeLeyningNames(parsha: string | string[]): LeyningNames;
+
     /**
      * Leyning for a parsha hashavua or holiday
      */
     export type Leyning = {
         /** Name of the parsha hashavua or holiday */
-        name: {
-            /** English */
-            en: string;
-            /** Hebrew (with nikud) */
-            he: string;
-        };
+        name: LeyningNames;
         /** An array of either 1 (regular) or 2 (doubled parsha). `undefined` for holiday readings */
         parsha?: string[];
         /** 1 for Bereshit, 2 for Noach, etc. `undefined` for holiday readings */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/leyning",
-  "version": "8.0.1",
+  "version": "8.1.0",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal",
@@ -31,7 +31,7 @@
     "leyning-csv": "bin/leyning-csv"
   },
   "dependencies": {
-    "@hebcal/core": "^5.0.0"
+    "@hebcal/core": "^5.0.1"
   },
   "scripts": {
     "build": "rollup -c",
@@ -61,6 +61,6 @@
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^4.0.2",
     "jsdoc-to-markdown": "^8.0.0",
-    "rollup": "^4.6.1"
+    "rollup": "^4.7.0"
   }
 }

src/calculateHaftarahNumVerses.js

@@ -9,7 +9,7 @@ export function calculateHaftarahNumVerses(haftara) {
   const sections = haftara.split(/[;,]/);
   let total = 0;
   let prevBook;
-  sections.forEach((haft) => {
+  for (const haft of sections) {
     const matches = haft.trim().match(/^(([^\d]+)\s+)?(\d.+)$/);
     if (matches !== null) {
       const hbook = matches[2] ? matches[2].trim() : prevBook;
@@ -27,6 +27,6 @@ export function calculateHaftarahNumVerses(haftara) {
       }
       prevBook = hbook;
     }
-  });
+  }
   return total || undefined;
 }