@hebcal/leyning 4.13.2 → 4.13.3

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/leyning v4.13.2 */
+/*! @hebcal/leyning v4.13.3 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -331,7 +331,7 @@ const HOLIDAY_IGNORE_MASK = core.flags.DAF_YOMI | core.flags.OMER_COUNT | core.f
  */
 
 function getLeyningForHoliday(e, il = false) {
-  if (!e instanceof core.Event) {
+  if (typeof e !== 'object' || !(e instanceof core.Event)) {
     throw new TypeError(`Bad event argument: ${e}`);
   } else if (e.getFlags() & core.flags.PARSHA_HASHAVUA) {
     throw new TypeError(`Event should be a holiday: ${e.getDesc()}`);
@@ -340,16 +340,7 @@ function getLeyningForHoliday(e, il = false) {
   }
 
   const key = getLeyningKeyForEvent(e, il);
-  const leyning = getLeyningForHolidayKey(key);
-
-  if (key === 'Sukkot Shabbat Chol ha-Moed') {
-    leyning.fullkriyah['M'] = leyning.fullkriyah[`M-day${e.cholHaMoedDay}`];
-
-    for (let day = 1; day <= 5; day++) {
-      delete leyning.fullkriyah[`M-day${day}`];
-    }
-  }
-
+  const leyning = getLeyningForHolidayKey(key, e.cholHaMoedDay);
   return leyning;
 }
 /**
@@ -424,7 +415,7 @@ function makeHaftaraSummary(haft) {
 
 
 function makeLeyningParts(aliyot) {
-  const nums = Object.keys(aliyot);
+  const nums = Object.keys(aliyot).filter(x => x.length === 1);
   let start = aliyot[nums[0]];
   let end = start;
   const parts = [];
@@ -497,11 +488,12 @@ function calculateHaftaraNumV(haft) {
  * (untranslated) string used in holiday-readings.json. Returns some
  * of full kriyah aliyot, special Maftir, special Haftarah
  * @param {string} key name from `holiday-readings.json` to find
+ * @param {number} [cholHaMoedDay]
  * @return {Leyning} map of aliyot
  */
 
 
-function getLeyningForHolidayKey(key) {
+function getLeyningForHolidayKey(key, cholHaMoedDay) {
   if (typeof key !== 'string') {
     return undefined;
   }
@@ -527,8 +519,18 @@ function getLeyningForHolidayKey(key) {
   const leyning = Object.create(null);
 
   if (src.fullkriyah) {
-    if (typeof src.fullkriyah['1'] === 'object') {
-      const parts = makeLeyningParts(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) {
@@ -536,7 +538,6 @@ function getLeyningForHolidayKey(key) {
       }
     }
 
-    leyning.fullkriyah = clone(src.fullkriyah);
     Object.values(leyning.fullkriyah).map(aliyah => calculateNumVerses(aliyah));
   }
 

package/dist/index.mjs

@@ -1,4 +1,4 @@
-/*! @hebcal/leyning v4.13.2 */
+/*! @hebcal/leyning v4.13.3 */
 import { parshiot, flags, months, Event, HebrewCalendar, HDate } 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,33,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 Nahum=[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,Nahum:Nahum,Habakkuk:Habakkuk,Zephaniah:Zephaniah,Haggai:Haggai,Zechariah:Zechariah,Malachi:Malachi};
@@ -327,7 +327,7 @@ const HOLIDAY_IGNORE_MASK = flags.DAF_YOMI | flags.OMER_COUNT | flags.SHABBAT_ME
  */
 
 function getLeyningForHoliday(e, il = false) {
-  if (!e instanceof Event) {
+  if (typeof e !== 'object' || !(e instanceof Event)) {
     throw new TypeError(`Bad event argument: ${e}`);
   } else if (e.getFlags() & flags.PARSHA_HASHAVUA) {
     throw new TypeError(`Event should be a holiday: ${e.getDesc()}`);
@@ -336,16 +336,7 @@ function getLeyningForHoliday(e, il = false) {
   }
 
   const key = getLeyningKeyForEvent(e, il);
-  const leyning = getLeyningForHolidayKey(key);
-
-  if (key === 'Sukkot Shabbat Chol ha-Moed') {
-    leyning.fullkriyah['M'] = leyning.fullkriyah[`M-day${e.cholHaMoedDay}`];
-
-    for (let day = 1; day <= 5; day++) {
-      delete leyning.fullkriyah[`M-day${day}`];
-    }
-  }
-
+  const leyning = getLeyningForHolidayKey(key, e.cholHaMoedDay);
   return leyning;
 }
 /**
@@ -420,7 +411,7 @@ function makeHaftaraSummary(haft) {
 
 
 function makeLeyningParts(aliyot) {
-  const nums = Object.keys(aliyot);
+  const nums = Object.keys(aliyot).filter(x => x.length === 1);
   let start = aliyot[nums[0]];
   let end = start;
   const parts = [];
@@ -493,11 +484,12 @@ function calculateHaftaraNumV(haft) {
  * (untranslated) string used in holiday-readings.json. Returns some
  * of full kriyah aliyot, special Maftir, special Haftarah
  * @param {string} key name from `holiday-readings.json` to find
+ * @param {number} [cholHaMoedDay]
  * @return {Leyning} map of aliyot
  */
 
 
-function getLeyningForHolidayKey(key) {
+function getLeyningForHolidayKey(key, cholHaMoedDay) {
   if (typeof key !== 'string') {
     return undefined;
   }
@@ -523,8 +515,18 @@ function getLeyningForHolidayKey(key) {
   const leyning = Object.create(null);
 
   if (src.fullkriyah) {
-    if (typeof src.fullkriyah['1'] === 'object') {
-      const parts = makeLeyningParts(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) {
@@ -532,7 +534,6 @@ function getLeyningForHolidayKey(key) {
       }
     }
 
-    leyning.fullkriyah = clone(src.fullkriyah);
     Object.values(leyning.fullkriyah).map(aliyah => calculateNumVerses(aliyah));
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/leyning",
-  "version": "4.13.2",
+  "version": "4.13.3",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal",
@@ -31,7 +31,7 @@
     "leyning-csv": "bin/leyning-csv"
   },
   "dependencies": {
-    "@hebcal/core": "^3.33.5"
+    "@hebcal/core": "^3.36.2"
   },
   "scripts": {
     "build": "rollup -c",
@@ -52,20 +52,20 @@
     "verbose": true
   },
   "devDependencies": {
-    "@babel/core": "^7.17.8",
+    "@babel/core": "^7.17.9",
     "@babel/preset-env": "^7.16.11",
     "@babel/register": "^7.17.7",
     "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^21.0.2",
+    "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "ava": "^4.1.0",
-    "core-js": "^3.21.1",
-    "eslint": "^8.11.0",
+    "@rollup/plugin-node-resolve": "^13.2.1",
+    "ava": "^4.2.0",
+    "core-js": "^3.22.2",
+    "eslint": "^8.14.0",
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^3.6.10",
     "jsdoc-to-markdown": "^7.1.1",
-    "rollup": "^2.70.1",
+    "rollup": "^2.70.2",
     "rollup-plugin-terser": "^7.0.2"
   }
 }