Fix Erev Purim on Sat nite

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/leyning",
-  "version": "8.1.7",
+  "version": "8.1.8",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "keywords": [
     "hebcal",
@@ -63,6 +63,6 @@
     "eslint-config-google": "^0.14.0",
     "jsdoc": "^4.0.2",
     "jsdoc-to-markdown": "^8.0.1",
-    "rollup": "^4.12.1"
+    "rollup": "^4.13.0"
   }
 }

src/getLeyningOnDate.js

@@ -1,4 +1,4 @@
-import {HDate, HebrewCalendar, ParshaEvent, months} from '@hebcal/core';
+import {HDate, HebrewCalendar, ParshaEvent, flags, months} from '@hebcal/core';
 import {getLeyningForHoliday, getLeyningForHolidayKey} from './getLeyningForHoliday.js';
 import {getLeyningKeyForEvent} from './getLeyningKeyForEvent.js';
 import {getLeyningForParshaHaShavua, getWeekdayReading, makeLeyningNames} from './leyning.js';
@@ -62,20 +62,29 @@ function findParshaHaShavua(saturday, il) {
  */
 export function getLeyningOnDate(hdate, il, wantarray = false) {
   const dow = hdate.getDay();
+  const arr = [];
+  let hasParshaHaShavua = false;
   if (dow === 6) {
     const hyear = hdate.getFullYear();
     const sedra = HebrewCalendar.getSedra(hyear, il);
     const parsha = sedra.lookup(hdate);
     if (!parsha.chag) {
       const parshaEvent = new ParshaEvent(hdate, parsha.parsha, il);
       const reading = getLeyningForParshaHaShavua(parshaEvent, il);
-      return wantarray ? [reading] : reading;
+      if (wantarray) {
+        hasParshaHaShavua = true;
+        arr.push(reading);
+      } else {
+        return reading;
+      }
     }
   }
   const events = HebrewCalendar.getHolidaysOnDate(hdate, il) || [];
-  const arr = [];
   let hasFullKriyah = false;
   for (const ev of events) {
+    if (hasParshaHaShavua && (ev.getFlags() & flags.SPECIAL_SHABBAT)) {
+      continue;
+    }
     const reading = getLeyningForHoliday(ev, il);
     if (reading) {
       arr.push(reading);

src/getLeyningOnDate.spec.js

@@ -270,3 +270,28 @@ test('getLeyningOnDate-weekday-erev9av', (t) => {
   t.is(readings[0].name.en, 'Vaetchanan');
   t.is(readings[1].name.en, 'Erev Tish\'a B\'Av');
 });
+
+test('getLeyningOnDate-erev9av-sat-nite', (t) => {
+  const hd = new HDate(8, 'Av', 5785);
+  const readings = getLeyningOnDate(hd, false, true);
+  t.is(readings.length, 2);
+  t.is(readings[0].name.en, 'Devarim');
+  t.is(readings[1].name.en, 'Erev Tish\'a B\'Av');
+});
+
+test('erev-purim-wed-nite', (t) => {
+  const hd = new HDate(13, 'Adar 2', 5782);
+  const readings = getLeyningOnDate(hd, false, true);
+  t.is(readings.length, 3);
+  t.is(readings[0].name.en, 'Ta\'anit Esther');
+  t.is(readings[1].name.en, 'Ta\'anit Esther (Mincha)');
+  t.is(readings[2].name.en, 'Erev Purim');
+});
+
+test('erev-purim-sat-nite', (t) => {
+  const hd = new HDate(13, 'Adar', 5784);
+  const readings = getLeyningOnDate(hd, false, true);
+  t.is(readings.length, 2);
+  t.is(readings[0].name.en, 'Vayikra');
+  t.is(readings[1].name.en, 'Erev Purim');
+});