@hebcal/leyning 4.15.0 → 4.15.1

package/dist/index.js

@@ -1,4 +1,4 @@
-/*! @hebcal/leyning v4.15.0 */
+/*! @hebcal/leyning v4.15.1 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -74,7 +74,9 @@ function clone(src) {
  */
 
 function addSefariaLinksToLeyning(aliyot, showBook) {
-  const book1 = aliyot['1'] && aliyot['1'].k;
+  var _aliyot$;
+
+  const book1 = (_aliyot$ = aliyot['1']) === null || _aliyot$ === void 0 ? void 0 : _aliyot$.k;
   Object.keys(aliyot).forEach(num => {
     const aliyah = aliyot[num];
     aliyah.num = num == 'M' ? 'maf' : num;
@@ -457,7 +459,19 @@ function getLeyningKeyForEvent(e, il = false) {
     return undefined;
   }
 
-  if (isRoshChodesh && desc !== 'Rosh Chodesh Tevet') {
+  if (desc === 'Rosh Chodesh Tevet') {
+    if (isShabbat) {
+      return 'Shabbat Rosh Chodesh Chanukah';
+    }
+
+    if (day === 30 || core.HDate.shortKislev(hd.getFullYear())) {
+      return 'Chanukah Day 6'; // 30th of Kislev or 1st of Tevet
+    } else {
+      return 'Chanukah Day 7 (on Rosh Chodesh)'; // 1st of Tevet
+    }
+  }
+
+  if (isRoshChodesh) {
     return desc;
   }
 
@@ -1418,7 +1432,7 @@ function getTriennialHaftara(parsha, yearNum) {
   const idx = parsha.length === 1 || yearNum === 0 ? 0 : 1;
   const name = parsha[idx];
   const triHaft = triennialHaft[name];
-  const triHaft2 = triHaft && triHaft[yearNum + 1];
+  const triHaft2 = triHaft === null || triHaft === void 0 ? void 0 : triHaft[yearNum + 1];
 
   if (typeof triHaft2 === 'object') {
     const haft = cloneHaftara(triHaft2);
@@ -1496,12 +1510,13 @@ function getParshaDates(events) {
 
 
 function writeFullKriyahCsv(stream, hyear, il) {
-  const events = core.HebrewCalendar.calendar({
+  const events0 = core.HebrewCalendar.calendar({
     year: hyear,
     isHebrewYear: true,
     sedrot: true,
     il: 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 => {
@@ -1517,13 +1532,14 @@ function writeFullKriyahCsv(stream, hyear, il) {
  */
 
 function writeTriennialCsv(stream, hyear) {
-  const events = core.HebrewCalendar.calendar({
+  const events0 = core.HebrewCalendar.calendar({
     year: hyear,
     isHebrewYear: true,
     numYears: 3,
     sedrot: true,
     il: false
   });
+  const events = events0.filter(ev => ev.getDesc() !== 'Rosh Chodesh Tevet');
   const parshaDates = getParshaDates(events);
   stream.write('"Date","Parashah","Aliyah","Triennial Reading","Verses"\r\n');
   events.forEach(ev => {
@@ -1671,10 +1687,12 @@ function getFullKriyahLines(reading) {
       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[num]) {
+        if ((_reading$reason = reading.reason) !== null && _reading$reason !== void 0 && _reading$reason[num]) {
           aliyah += ' | ' + reading.reason[num];
         }
 
@@ -1686,9 +1704,11 @@ function getFullKriyahLines(reading) {
   let specialHaftara = false;
 
   if (reading.haftara) {
+    var _reading$reason2;
+
     let haftara = reading.haftara.replace(/,/g, ';');
 
-    if (reading.reason && reading.reason.haftara) {
+    if ((_reading$reason2 = reading.reason) !== null && _reading$reason2 !== void 0 && _reading$reason2.haftara) {
       specialHaftara = true;
       haftara += ' | ' + reading.reason.haftara;
     }

package/dist/index.mjs

@@ -1,5 +1,5 @@
-/*! @hebcal/leyning v4.15.0 */
-import { parshiot, flags, months, Event, HebrewCalendar, HDate } from '@hebcal/core';
+/*! @hebcal/leyning v4.15.1 */
+import { parshiot, flags, months, HDate, Event, HebrewCalendar } 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 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};
 
@@ -70,7 +70,9 @@ function clone(src) {
  */
 
 function addSefariaLinksToLeyning(aliyot, showBook) {
-  const book1 = aliyot['1'] && aliyot['1'].k;
+  var _aliyot$;
+
+  const book1 = (_aliyot$ = aliyot['1']) === null || _aliyot$ === void 0 ? void 0 : _aliyot$.k;
   Object.keys(aliyot).forEach(num => {
     const aliyah = aliyot[num];
     aliyah.num = num == 'M' ? 'maf' : num;
@@ -453,7 +455,19 @@ function getLeyningKeyForEvent(e, il = false) {
     return undefined;
   }
 
-  if (isRoshChodesh && desc !== 'Rosh Chodesh Tevet') {
+  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 {
+      return 'Chanukah Day 7 (on Rosh Chodesh)'; // 1st of Tevet
+    }
+  }
+
+  if (isRoshChodesh) {
     return desc;
   }
 
@@ -1414,7 +1428,7 @@ function getTriennialHaftara(parsha, yearNum) {
   const idx = parsha.length === 1 || yearNum === 0 ? 0 : 1;
   const name = parsha[idx];
   const triHaft = triennialHaft[name];
-  const triHaft2 = triHaft && triHaft[yearNum + 1];
+  const triHaft2 = triHaft === null || triHaft === void 0 ? void 0 : triHaft[yearNum + 1];
 
   if (typeof triHaft2 === 'object') {
     const haft = cloneHaftara(triHaft2);
@@ -1492,12 +1506,13 @@ function getParshaDates(events) {
 
 
 function writeFullKriyahCsv(stream, hyear, il) {
-  const events = HebrewCalendar.calendar({
+  const events0 = HebrewCalendar.calendar({
     year: hyear,
     isHebrewYear: true,
     sedrot: true,
     il: 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 => {
@@ -1513,13 +1528,14 @@ function writeFullKriyahCsv(stream, hyear, il) {
  */
 
 function writeTriennialCsv(stream, hyear) {
-  const events = HebrewCalendar.calendar({
+  const events0 = HebrewCalendar.calendar({
     year: hyear,
     isHebrewYear: true,
     numYears: 3,
     sedrot: true,
     il: false
   });
+  const events = events0.filter(ev => ev.getDesc() !== 'Rosh Chodesh Tevet');
   const parshaDates = getParshaDates(events);
   stream.write('"Date","Parashah","Aliyah","Triennial Reading","Verses"\r\n');
   events.forEach(ev => {
@@ -1667,10 +1683,12 @@ function getFullKriyahLines(reading) {
       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[num]) {
+        if ((_reading$reason = reading.reason) !== null && _reading$reason !== void 0 && _reading$reason[num]) {
           aliyah += ' | ' + reading.reason[num];
         }
 
@@ -1682,9 +1700,11 @@ function getFullKriyahLines(reading) {
   let specialHaftara = false;
 
   if (reading.haftara) {
+    var _reading$reason2;
+
     let haftara = reading.haftara.replace(/,/g, ';');
 
-    if (reading.reason && reading.reason.haftara) {
+    if ((_reading$reason2 = reading.reason) !== null && _reading$reason2 !== void 0 && _reading$reason2.haftara) {
       specialHaftara = true;
       haftara += ' | ' + reading.reason.haftara;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/leyning",
-  "version": "4.15.0",
+  "version": "4.15.1",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal",
@@ -52,20 +52,20 @@
     "verbose": true
   },
   "devDependencies": {
-    "@babel/core": "^7.18.6",
-    "@babel/preset-env": "^7.18.6",
-    "@babel/register": "^7.18.6",
+    "@babel/core": "^7.18.9",
+    "@babel/preset-env": "^7.18.9",
+    "@babel/register": "^7.18.9",
     "@rollup/plugin-babel": "^5.3.1",
     "@rollup/plugin-commonjs": "^22.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
-    "ava": "^4.3.0",
-    "core-js": "^3.23.3",
-    "eslint": "^8.19.0",
+    "ava": "^4.3.1",
+    "core-js": "^3.23.5",
+    "eslint": "^8.20.0",
     "eslint-config-google": "^0.14.0",
-    "jsdoc": "^3.6.10",
+    "jsdoc": "^3.6.11",
     "jsdoc-to-markdown": "^7.1.1",
-    "rollup": "^2.76.0",
+    "rollup": "^2.77.0",
     "rollup-plugin-terser": "^7.0.2"
   }
 }