Include Yizkor event earlier in event array (before omer / candles)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hebcal/core",
-  "version": "5.8.0",
+  "version": "5.8.1",
   "author": "Michael J. Radwin (https://github.com/mjradwin)",
   "contributors": [
     "Eyal Schachter (https://github.com/Scimonster)",
@@ -45,6 +45,7 @@
   "bugs": {
     "url": "https://github.com/hebcal/hebcal-es6/issues"
   },
+  "homepage": "https://hebcal.github.io/api/core/",
   "files": [
     "dist"
   ],
@@ -88,7 +89,7 @@
     "gts": "^6.0.2",
     "jest": "^29.7.0",
     "pretty-bytes": "^6.1.1",
-    "rollup": "^4.24.4",
+    "rollup": "^4.25.0",
     "rollup-plugin-bundle-size": "^1.0.3",
     "rollup-plugin-visualizer": "^5.12.0",
     "ttag-cli": "^1.10.12",

src/calendar.ts

@@ -202,6 +202,18 @@ export function calendar(options: CalOptions = {}): Event[] {
         evts.push(new ParshaEvent(hd, parsha0.parsha, il, parsha0.num));
       }
     }
+    if (options.yizkor) {
+      const mm = hd.getMonth();
+      const dd = hd.getDate();
+      if (
+        (mm === months.TISHREI && (dd === 10 || dd === 22)) ||
+        (mm === NISAN && dd === (il ? 21 : 22)) ||
+        (mm === SIVAN && dd === (il ? 6 : 7))
+      ) {
+        const ev = new Event(hd, 'Yizkor', flags.YIZKOR, {emoji: '🕯️'});
+        evts.push(ev);
+      }
+    }
     const dailyLearning = options.dailyLearning;
     if (typeof dailyLearning === 'object') {
       const events = makeDailyLearning(hd, dailyLearning, il);
@@ -234,18 +246,6 @@ export function calendar(options: CalOptions = {}): Event[] {
     if (candlesEv) {
       evts.push(candlesEv);
     }
-    if (options.yizkor) {
-      const mm = hd.getMonth();
-      const dd = hd.getDate();
-      if (
-        (mm === months.TISHREI && (dd === 10 || dd === 22)) ||
-        (mm === NISAN && dd === (il ? 21 : 22)) ||
-        (mm === SIVAN && dd === (il ? 6 : 7))
-      ) {
-        const ev = new Event(hd, 'Yizkor', flags.YIZKOR, {emoji: '🕯️'});
-        evts.push(ev);
-      }
-    }
     if (
       options.addHebrewDates ||
       (options.addHebrewDatesForEvents && prevEventsLength !== evts.length)