From 79d9d8bf5a6c036c5d9b37b90182fb4b53835cd8 Mon Sep 17 00:00:00 2001
From: SLaks <Dev@SLaks.net>
Date: Sun, 13 Oct 2024 11:53:48 -0400
Subject: [PATCH] Calendar: Make generator tests produce easily-readable
 snapshots

This makes it easier to verify that the snapshots are actually correct.

I left one raw dump to verify the actual object.
---
 src/calendar-model/generator.test.ts      |   67 +-
 src/calendar-model/generator.test.ts.md   | 1066 ++++++---------------
 src/calendar-model/generator.test.ts.snap |  Bin 6335 -> 4561 bytes
 src/calendar-model/hebcal-conversions.ts  |   14 +-
 src/calendar-model/test-utils.ts          |    2 +-
 5 files changed, 333 insertions(+), 816 deletions(-)

diff --git a/src/calendar-model/generator.test.ts b/src/calendar-model/generator.test.ts
index 52837fc0..acefbe26 100644
--- a/src/calendar-model/generator.test.ts
+++ b/src/calendar-model/generator.test.ts
@@ -1,8 +1,11 @@
 import test from 'ava'
 import { UserSettings } from './user-settings.ts'
 import { LeiningGenerator } from './generator.ts'
-import { HDate, months } from '@hebcal/core'
-import { LeiningDate } from './model-types.ts'
+import { HDate, Locale, months } from '@hebcal/core'
+import { LeiningAliyah, LeiningDate } from './model-types.ts'
+import hebrewNumeralFromInteger from '../hebrew-numeral.ts'
+import { Ref } from '../ref.ts'
+import { getBookName } from './hebcal-conversions.ts'
 
 const testSettings: UserSettings = {
   ashkenazi: true,
@@ -26,43 +29,69 @@ for (let year = 5780; year < 5800; year++) {
 
 test('generates יום כיפור', (t) => {
   t.snapshot(
-    stripDate(generator.createLeiningDate(new HDate(10, months.TISHREI, 5784)))
+    dumpLeiningDate(new HDate(10, months.TISHREI, 5784)),
+    'These tests verify the returned information, in easily readable format'
   )
 })
 
 test('generates שמחת תורה', (t) => {
-  t.snapshot(
-    stripDate(generator.createLeiningDate(new HDate(23, months.TISHREI, 5784)))
-  )
+  t.snapshot(dumpLeiningDate(new HDate(23, months.TISHREI, 5784)))
 })
 
 test('generates תענית אסתר', (t) => {
-  t.snapshot(
-    stripDate(generator.createLeiningDate(new HDate(13, months.ADAR_II, 5785)))
-  )
+  t.snapshot(dumpLeiningDate(new HDate(13, months.ADAR_II, 5785)))
 })
 
 test('generates פורים', (t) => {
-  t.snapshot(
-    stripDate(generator.createLeiningDate(new HDate(14, months.ADAR_II, 5784)))
-  )
+  t.snapshot(dumpLeiningDate(new HDate(14, months.ADAR_II, 5784)))
 })
 
 test('generates ערב תשעה באב', (t) => {
-  t.snapshot(
-    stripDate(generator.createLeiningDate(new HDate(8, months.AV, 5784)))
-  )
+  t.snapshot(dumpLeiningDate(new HDate(8, months.AV, 5784)))
 })
 
 test('generates תשעה באב', (t) => {
-  t.snapshot(
-    stripDate(generator.createLeiningDate(new HDate(9, months.AV, 5784)))
-  )
+  t.snapshot(dumpLeiningDate(new HDate(9, months.AV, 5784)))
 })
 
 test('generates שבת ראש חודש חנוכה', (t) => {
+  t.snapshot(dumpLeiningDate(new HDate(30, months.KISLEV, 5782)))
+})
+
+/** Prints the information in a `LeiningDate`, to be easily readable in the Markdown snapshot. */
+function dumpLeiningDate(date: HDate) {
+  const ld = generator.createLeiningDate(date)
+  if (!ld) return null
+  return {
+    date: ld.id,
+    title: ld.title,
+    leinings: ld.leinings.map((o) => ({
+      isParsha: o.isParsha,
+      runs: o.runs.map((r) => ({
+        id: r.id,
+        type: r.type,
+        scroll: r.scroll,
+        aliyot: r.aliyot.map(
+          // TODO(haftara): Render book name, once we have those
+          (a) =>
+            `${a.index}: ${bookName(a)} ${dumpRef(a.start)} - ${dumpRef(a.end)}`
+        ),
+      })),
+    })),
+  }
+}
+function bookName(a: LeiningAliyah) {
+  return Locale.gettext(getBookName(a.start), 'he-x-nonikud')
+}
+
+function dumpRef(ref: Ref) {
+  return `${hebrewNumeralFromInteger(ref.c)}:${hebrewNumeralFromInteger(ref.v)}`
+}
+
+test('generates the full LeiningDate object for יום כיפור', (t) => {
   t.snapshot(
-    stripDate(generator.createLeiningDate(new HDate(30, months.KISLEV, 5782)))
+    stripDate(generator.createLeiningDate(new HDate(10, months.TISHREI, 5784))),
+    'This test verified the full structure of the LeiningDate interface'
   )
 })
 
diff --git a/src/calendar-model/generator.test.ts.md b/src/calendar-model/generator.test.ts.md
index 08b53879..0a145d35 100644
--- a/src/calendar-model/generator.test.ts.md
+++ b/src/calendar-model/generator.test.ts.md
@@ -6,256 +6,65 @@ Generated by [AVA](https://avajs.dev).
 
 ## generates יום כיפור
 
-> Snapshot 1
+> These tests verify the returned information, in easily readable format
 
     {
-      id: '2023-09-25',
+      date: '2023-09-25',
       leinings: [
         {
-          date: [Circular],
-          id: 'שחרית',
           isParsha: false,
           runs: [
             {
               aliyot: [
-                {
-                  end: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 6,
-                  },
-                  index: 1,
-                  start: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 1,
-                  },
-                },
-                {
-                  end: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 11,
-                  },
-                  index: 2,
-                  start: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 7,
-                  },
-                },
-                {
-                  end: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 17,
-                  },
-                  index: 3,
-                  start: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 12,
-                  },
-                },
-                {
-                  end: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 24,
-                  },
-                  index: 4,
-                  start: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 18,
-                  },
-                },
-                {
-                  end: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 30,
-                  },
-                  index: 5,
-                  start: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 25,
-                  },
-                },
-                {
-                  end: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 34,
-                  },
-                  index: 6,
-                  start: {
-                    b: 3,
-                    c: 16,
-                    scroll: 'torah',
-                    v: 31,
-                  },
-                },
+                '1: Leviticus טז:א - טז:ו',
+                '2: Leviticus טז:ז - טז:יא',
+                '3: Leviticus טז:יב - טז:יז',
+                '4: Leviticus טז:יח - טז:כד',
+                '5: Leviticus טז:כה - טז:ל',
+                '6: Leviticus טז:לא - טז:לד',
               ],
               id: '2023-09-25:shacharis,main',
-              leining: [Circular],
               scroll: 'torah',
               type: 'Main',
             },
             {
               aliyot: [
-                {
-                  end: {
-                    b: 4,
-                    c: 29,
-                    scroll: 'torah',
-                    v: 11,
-                  },
-                  index: 'Maftir',
-                  start: {
-                    b: 4,
-                    c: 29,
-                    scroll: 'torah',
-                    v: 7,
-                  },
-                },
+                'Maftir: Numbers כט:ז - כט:יא',
               ],
               id: '2023-09-25:shacharis,maftir',
-              leining: [Circular],
               scroll: 'torah',
               type: 'מפטיר',
             },
             {
               aliyot: [
-                {
-                  end: {
-                    b: 1,
-                    c: 58,
-                    scroll: 'esther',
-                    v: 14,
-                  },
-                  index: undefined,
-                  start: {
-                    b: 1,
-                    c: 57,
-                    scroll: 'esther',
-                    v: 14,
-                  },
-                },
+                'undefined: ישעיהו נז:יד - נח:יד',
               ],
               id: '2023-09-25:shacharis,haftara',
-              leining: [Circular],
-              scroll: 'esther',
+              scroll: 'isaiah',
               type: 'הפטרה',
             },
           ],
         },
         {
-          date: [Circular],
-          id: 'מנחה',
           isParsha: false,
           runs: [
             {
               aliyot: [
-                {
-                  end: {
-                    b: 3,
-                    c: 18,
-                    scroll: 'torah',
-                    v: 5,
-                  },
-                  index: 1,
-                  start: {
-                    b: 3,
-                    c: 18,
-                    scroll: 'torah',
-                    v: 1,
-                  },
-                },
-                {
-                  end: {
-                    b: 3,
-                    c: 18,
-                    scroll: 'torah',
-                    v: 21,
-                  },
-                  index: 2,
-                  start: {
-                    b: 3,
-                    c: 18,
-                    scroll: 'torah',
-                    v: 6,
-                  },
-                },
-                {
-                  end: {
-                    b: 3,
-                    c: 18,
-                    scroll: 'torah',
-                    v: 30,
-                  },
-                  index: 'Maftir',
-                  start: {
-                    b: 3,
-                    c: 18,
-                    scroll: 'torah',
-                    v: 22,
-                  },
-                },
+                '1: Leviticus יח:א - יח:ה',
+                '2: Leviticus יח:ו - יח:כא',
+                'Maftir: Leviticus יח:כב - יח:ל',
               ],
               id: '2023-09-25:mincha,main',
-              leining: [Circular],
               scroll: 'torah',
               type: 'Main',
             },
             {
               aliyot: [
-                {
-                  end: {
-                    b: 1,
-                    c: 4,
-                    scroll: 'esther',
-                    v: 11,
-                  },
-                  index: undefined,
-                  start: {
-                    b: 1,
-                    c: 1,
-                    scroll: 'esther',
-                    v: 1,
-                  },
-                },
-                {
-                  end: {
-                    b: 1,
-                    c: 7,
-                    scroll: 'esther',
-                    v: 20,
-                  },
-                  index: undefined,
-                  start: {
-                    b: 1,
-                    c: 7,
-                    scroll: 'esther',
-                    v: 18,
-                  },
-                },
+                'undefined: יונה א:א - ד:יא',
+                'undefined: מיכה ז:יח - ז:כ',
               ],
               id: '2023-09-25:mincha,haftara',
-              leining: [Circular],
-              scroll: 'esther',
+              scroll: 'jonah',
               type: 'הפטרה',
             },
           ],
@@ -269,178 +78,46 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
-      id: '2023-10-08',
+      date: '2023-10-08',
       leinings: [
         {
-          date: [Circular],
-          id: 'שחרית',
           isParsha: false,
           runs: [
             {
               aliyot: [
-                {
-                  end: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 7,
-                  },
-                  index: 1,
-                  start: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 1,
-                  },
-                },
-                {
-                  end: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 12,
-                  },
-                  index: 2,
-                  start: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 8,
-                  },
-                },
-                {
-                  end: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 17,
-                  },
-                  index: 3,
-                  start: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 13,
-                  },
-                },
-                {
-                  end: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 21,
-                  },
-                  index: 4,
-                  start: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 18,
-                  },
-                },
-                {
-                  end: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 26,
-                  },
-                  index: 5,
-                  start: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 22,
-                  },
-                },
-                {
-                  end: {
-                    b: 5,
-                    c: 34,
-                    scroll: 'torah',
-                    v: 12,
-                  },
-                  index: 6,
-                  start: {
-                    b: 5,
-                    c: 33,
-                    scroll: 'torah',
-                    v: 27,
-                  },
-                },
+                '1: Deuteronomy לג:א - לג:ז',
+                '2: Deuteronomy לג:ח - לג:יב',
+                '3: Deuteronomy לג:יג - לג:יז',
+                '4: Deuteronomy לג:יח - לג:כא',
+                '5: Deuteronomy לג:כב - לג:כו',
+                '6: Deuteronomy לג:כז - לד:יב',
               ],
               id: '2023-10-08:shacharis,main',
-              leining: [Circular],
               scroll: 'torah',
               type: 'Main',
             },
             {
               aliyot: [
-                {
-                  end: {
-                    b: 1,
-                    c: 2,
-                    scroll: 'torah',
-                    v: 3,
-                  },
-                  index: 7,
-                  start: {
-                    b: 1,
-                    c: 1,
-                    scroll: 'torah',
-                    v: 1,
-                  },
-                },
+                '7: Genesis א:א - ב:ג',
               ],
               id: '2023-10-08:shacharis,last-aliyah',
-              leining: [Circular],
               scroll: 'torah',
               type: 'שביעי',
-            },
-            {
-              aliyot: [
-                {
-                  end: {
-                    b: 4,
-                    c: 30,
-                    scroll: 'torah',
-                    v: 1,
-                  },
-                  index: 'Maftir',
-                  start: {
-                    b: 4,
-                    c: 29,
-                    scroll: 'torah',
-                    v: 35,
-                  },
-                },
+            },
+            {
+              aliyot: [
+                'Maftir: Numbers כט:לה - ל:א',
               ],
               id: '2023-10-08:shacharis,maftir',
-              leining: [Circular],
               scroll: 'torah',
               type: 'מפטיר',
             },
             {
               aliyot: [
-                {
-                  end: {
-                    b: 1,
-                    c: 1,
-                    scroll: 'esther',
-                    v: 18,
-                  },
-                  index: undefined,
-                  start: {
-                    b: 1,
-                    c: 1,
-                    scroll: 'esther',
-                    v: 1,
-                  },
-                },
+                'undefined: יהושוע א:א - א:יח',
               ],
               id: '2023-10-08:shacharis,haftara',
-              leining: [Circular],
-              scroll: 'esther',
+              scroll: 'joshua',
               type: 'הפטרה',
             },
           ],
@@ -454,184 +131,60 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
-      id: '2025-03-13',
+      date: '2025-03-13',
       leinings: [
         {
-          date: [Circular],
-          id: 'שחרית',
           isParsha: false,
           runs: [
             {
               aliyot: [
-                {
-                  end: {
-                    b: 2,
-                    c: 32,
-                    scroll: 'torah',
-                    v: 14,
-                  },
-                  index: 1,
-                  start: {
-                    b: 2,
-                    c: 32,
-                    scroll: 'torah',
-                    v: 11,
-                  },
-                },
-                {
-                  end: {
-                    b: 2,
-                    c: 34,
-                    scroll: 'torah',
-                    v: 3,
-                  },
-                  index: 2,
-                  start: {
-                    b: 2,
-                    c: 34,
-                    scroll: 'torah',
-                    v: 1,
-                  },
-                },
-                {
-                  end: {
-                    b: 2,
-                    c: 34,
-                    scroll: 'torah',
-                    v: 10,
-                  },
-                  index: 3,
-                  start: {
-                    b: 2,
-                    c: 34,
-                    scroll: 'torah',
-                    v: 4,
-                  },
-                },
+                '1: Exodus לב:יא - לב:יד',
+                '2: Exodus לד:א - לד:ג',
+                '3: Exodus לד:ד - לד:י',
               ],
               id: '2025-03-13:shacharis,main',
-              leining: [Circular],
               scroll: 'torah',
               type: 'Main',
             },
           ],
         },
         {
-          date: [Circular],
-          id: 'מנחה',
           isParsha: false,
           runs: [
             {
               aliyot: [
-                {
-                  end: {
-                    b: 2,
-                    c: 32,
-                    scroll: 'torah',
-                    v: 14,
-                  },
-                  index: 1,
-                  start: {
-                    b: 2,
-                    c: 32,
-                    scroll: 'torah',
-                    v: 11,
-                  },
-                },
-                {
-                  end: {
-                    b: 2,
-                    c: 34,
-                    scroll: 'torah',
-                    v: 3,
-                  },
-                  index: 2,
-                  start: {
-                    b: 2,
-                    c: 34,
-                    scroll: 'torah',
-                    v: 1,
-                  },
-                },
-                {
-                  end: {
-                    b: 2,
-                    c: 34,
-                    scroll: 'torah',
-                    v: 10,
-                  },
-                  index: 'Maftir',
-                  start: {
-                    b: 2,
-                    c: 34,
-                    scroll: 'torah',
-                    v: 4,
-                  },
-                },
+                '1: Exodus לב:יא - לב:יד',
+                '2: Exodus לד:א - לד:ג',
+                'Maftir: Exodus לד:ד - לד:י',
               ],
               id: '2025-03-13:mincha,main',
-              leining: [Circular],
               scroll: 'torah',
               type: 'Main',
             },
             {
               aliyot: [
-                {
-                  end: {
-                    b: 1,
-                    c: 56,
-                    scroll: 'esther',
-                    v: 8,
-                  },
-                  index: undefined,
-                  start: {
-                    b: 1,
-                    c: 55,
-                    scroll: 'esther',
-                    v: 6,
-                  },
-                },
+                'undefined: ישעיהו נה:ו - נו:ח',
               ],
               id: '2025-03-13:mincha,haftara',
-              leining: [Circular],
-              scroll: 'esther',
+              scroll: 'isaiah',
               type: 'הפטרה',
             },
           ],
         },
         {
-          date: [Circular],
-          id: 'מגילה',
           isParsha: false,
           runs: [
             {
               aliyot: [
-                {
-                  end: {
-                    b: 1,
-                    c: 10,
-                    scroll: 'esther',
-                    v: 3,
-                  },
-                  index: undefined,
-                  start: {
-                    b: 1,
-                    c: 1,
-                    scroll: 'esther',
-                    v: 1,
-                  },
-                },
+                'undefined: אסתר א:א - י:ג',
               ],
               id: '2025-03-13:megillah,megillah',
-              leining: [Circular],
               scroll: 'esther',
               type: 'מגילה',
             },
           ],
         },
         {
-          date: [Circular],
-          id: 'מעריב',
           isParsha: false,
           runs: [],
         },
@@ -644,93 +197,31 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
-      id: '2024-03-24',
+      date: '2024-03-24',
       leinings: [
         {
-          date: [Circular],
-          id: 'מגילה',
           isParsha: false,
           runs: [
             {
               aliyot: [
-                {
-                  end: {
-                    b: 1,
-                    c: 10,
-                    scroll: 'esther',
-                    v: 3,
-                  },
-                  index: undefined,
-                  start: {
-                    b: 1,
-                    c: 1,
-                    scroll: 'esther',
-                    v: 1,
-                  },
-                },
+                'undefined: אסתר א:א - י:ג',
               ],
               id: '2024-03-24:megillah,megillah',
-              leining: [Circular],
               scroll: 'esther',
               type: 'מגילה',
             },
           ],
         },
         {
-          date: [Circular],
-          id: 'שחרית',
           isParsha: false,
           runs: [
             {
               aliyot: [
-                {
-                  end: {
-                    b: 2,
-                    c: 17,
-                    scroll: 'torah',
-                    v: 10,
-                  },
-                  index: 1,
-                  start: {
-                    b: 2,
-                    c: 17,
-                    scroll: 'torah',
-                    v: 8,
-                  },
-                },
-                {
-                  end: {
-                    b: 2,
-                    c: 17,
-                    scroll: 'torah',
-                    v: 13,
-                  },
-                  index: 2,
-                  start: {
-                    b: 2,
-                    c: 17,
-                    scroll: 'torah',
-                    v: 11,
-                  },
-                },
-                {
-                  end: {
-                    b: 2,
-                    c: 17,
-                    scroll: 'torah',
-                    v: 16,
-                  },
-                  index: 3,
-                  start: {
-                    b: 2,
-                    c: 17,
-                    scroll: 'torah',
-                    v: 14,
-                  },
-                },
+                '1: Exodus יז:ח - יז:י',
+                '2: Exodus יז:יא - יז:יג',
+                '3: Exodus יז:יד - יז:טז',
               ],
               id: '2024-03-24:shacharis,main',
-              leining: [Circular],
               scroll: 'torah',
               type: 'Main',
             },
@@ -745,54 +236,145 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
-      id: '2024-08-12',
+      date: '2024-08-12',
       leinings: [
         {
-          date: [Circular],
-          id: 'מגילה',
           isParsha: false,
           runs: [
             {
               aliyot: [
-                {
-                  end: {
-                    b: 1,
-                    c: 5,
-                    scroll: 'esther',
-                    v: 22,
-                  },
-                  index: undefined,
-                  start: {
-                    b: 1,
-                    c: 1,
-                    scroll: 'esther',
-                    v: 1,
-                  },
-                },
+                'undefined: איכה א:א - ה:כב',
+              ],
+              id: '2024-08-12:megillah,megillah',
+              scroll: 'lamentations',
+              type: 'מגילה',
+            },
+          ],
+        },
+        {
+          isParsha: false,
+          runs: [],
+        },
+      ],
+      title: 'ערב תשעה באב',
+    }
+
+## generates תשעה באב
+
+> Snapshot 1
+
+    {
+      date: '2024-08-13',
+      leinings: [
+        {
+          isParsha: false,
+          runs: [
+            {
+              aliyot: [
+                '1: Deuteronomy ד:כה - ד:כט',
+                '2: Deuteronomy ד:ל - ד:לה',
+                '3: Deuteronomy ד:לו - ד:מ',
+              ],
+              id: '2024-08-13:shacharis,main',
+              scroll: 'torah',
+              type: 'Main',
+            },
+            {
+              aliyot: [
+                'undefined: ירמיהו ח:יג - ט:כג',
+              ],
+              id: '2024-08-13:shacharis,haftara',
+              scroll: 'jeremiah',
+              type: 'הפטרה',
+            },
+          ],
+        },
+        {
+          isParsha: false,
+          runs: [
+            {
+              aliyot: [
+                '1: Exodus לב:יא - לב:יד',
+                '2: Exodus לד:א - לד:ג',
+                'Maftir: Exodus לד:ד - לד:י',
+              ],
+              id: '2024-08-13:mincha,main',
+              scroll: 'torah',
+              type: 'Main',
+            },
+            {
+              aliyot: [
+                'undefined: ישעיהו נה:ו - נו:ח',
+              ],
+              id: '2024-08-13:mincha,haftara',
+              scroll: 'isaiah',
+              type: 'הפטרה',
+            },
+          ],
+        },
+      ],
+      title: 'תשעה באב',
+    }
+
+## generates שבת ראש חודש חנוכה
+
+> Snapshot 1
+
+    {
+      date: '2021-12-04',
+      leinings: [
+        {
+          isParsha: true,
+          runs: [
+            {
+              aliyot: [
+                '1: Genesis מא:א - מא:יד',
+                '2: Genesis מא:טו - מא:לח',
+                '3: Genesis מא:לט - מא:נב',
+                '4: Genesis מא:נג - מב:יח',
+                '5: Genesis מב:יט - מג:טו',
+                '6: Genesis מג:טז - מד:יז',
+              ],
+              id: '2021-12-04:shacharis,main',
+              scroll: 'torah',
+              type: 'Main',
+            },
+            {
+              aliyot: [
+                '7: Numbers כח:ט - כח:טו',
+              ],
+              id: '2021-12-04:shacharis,last-aliyah',
+              scroll: 'torah',
+              type: 'שביעי',
+            },
+            {
+              aliyot: [
+                'Maftir: Numbers ז:מב - ז:מז',
+              ],
+              id: '2021-12-04:shacharis,maftir',
+              scroll: 'torah',
+              type: 'מפטיר',
+            },
+            {
+              aliyot: [
+                'undefined: זכריה ב:יד - ד:ז',
               ],
-              id: '2024-08-12:megillah,megillah',
-              leining: [Circular],
-              scroll: 'esther',
-              type: 'מגילה',
+              id: '2021-12-04:shacharis,haftara',
+              scroll: 'zechariah',
+              type: 'הפטרה',
             },
           ],
         },
-        {
-          date: [Circular],
-          id: 'מעריב',
-          isParsha: false,
-          runs: [],
-        },
       ],
-      title: 'ערב תשעה באב',
+      title: 'פרשת מקץ',
     }
 
-## generates תשעה באב
+## generates the full LeiningDate object for יום כיפור
 
-> Snapshot 1
+> This test verified the full structure of the LeiningDate interface
 
     {
-      id: '2024-08-13',
+      id: '2023-09-25',
       leinings: [
         {
           date: [Circular],
@@ -803,273 +385,202 @@ Generated by [AVA](https://avajs.dev).
               aliyot: [
                 {
                   end: {
-                    b: 5,
-                    c: 4,
+                    b: 3,
+                    c: 16,
                     scroll: 'torah',
-                    v: 29,
+                    v: 6,
                   },
                   index: 1,
                   start: {
-                    b: 5,
-                    c: 4,
+                    b: 3,
+                    c: 16,
                     scroll: 'torah',
-                    v: 25,
+                    v: 1,
                   },
                 },
                 {
                   end: {
-                    b: 5,
-                    c: 4,
+                    b: 3,
+                    c: 16,
                     scroll: 'torah',
-                    v: 35,
+                    v: 11,
                   },
                   index: 2,
                   start: {
-                    b: 5,
-                    c: 4,
+                    b: 3,
+                    c: 16,
                     scroll: 'torah',
-                    v: 30,
+                    v: 7,
                   },
                 },
                 {
                   end: {
-                    b: 5,
-                    c: 4,
+                    b: 3,
+                    c: 16,
                     scroll: 'torah',
-                    v: 40,
+                    v: 17,
                   },
                   index: 3,
                   start: {
-                    b: 5,
-                    c: 4,
+                    b: 3,
+                    c: 16,
                     scroll: 'torah',
-                    v: 36,
+                    v: 12,
                   },
                 },
-              ],
-              id: '2024-08-13:shacharis,main',
-              leining: [Circular],
-              scroll: 'torah',
-              type: 'Main',
-            },
-            {
-              aliyot: [
                 {
                   end: {
-                    b: 1,
-                    c: 9,
-                    scroll: 'esther',
-                    v: 23,
+                    b: 3,
+                    c: 16,
+                    scroll: 'torah',
+                    v: 24,
                   },
-                  index: undefined,
+                  index: 4,
                   start: {
-                    b: 1,
-                    c: 8,
-                    scroll: 'esther',
-                    v: 13,
+                    b: 3,
+                    c: 16,
+                    scroll: 'torah',
+                    v: 18,
                   },
                 },
-              ],
-              id: '2024-08-13:shacharis,haftara',
-              leining: [Circular],
-              scroll: 'esther',
-              type: 'הפטרה',
-            },
-          ],
-        },
-        {
-          date: [Circular],
-          id: 'מנחה',
-          isParsha: false,
-          runs: [
-            {
-              aliyot: [
                 {
                   end: {
-                    b: 2,
-                    c: 32,
+                    b: 3,
+                    c: 16,
                     scroll: 'torah',
-                    v: 14,
+                    v: 30,
                   },
-                  index: 1,
+                  index: 5,
                   start: {
-                    b: 2,
-                    c: 32,
+                    b: 3,
+                    c: 16,
                     scroll: 'torah',
-                    v: 11,
+                    v: 25,
                   },
                 },
                 {
                   end: {
-                    b: 2,
-                    c: 34,
+                    b: 3,
+                    c: 16,
                     scroll: 'torah',
-                    v: 3,
+                    v: 34,
                   },
-                  index: 2,
+                  index: 6,
                   start: {
-                    b: 2,
-                    c: 34,
+                    b: 3,
+                    c: 16,
                     scroll: 'torah',
-                    v: 1,
+                    v: 31,
                   },
                 },
+              ],
+              id: '2023-09-25:shacharis,main',
+              leining: [Circular],
+              scroll: 'torah',
+              type: 'Main',
+            },
+            {
+              aliyot: [
                 {
                   end: {
-                    b: 2,
-                    c: 34,
+                    b: 4,
+                    c: 29,
                     scroll: 'torah',
-                    v: 10,
+                    v: 11,
                   },
                   index: 'Maftir',
                   start: {
-                    b: 2,
-                    c: 34,
+                    b: 4,
+                    c: 29,
                     scroll: 'torah',
-                    v: 4,
+                    v: 7,
                   },
                 },
               ],
-              id: '2024-08-13:mincha,main',
+              id: '2023-09-25:shacharis,maftir',
               leining: [Circular],
               scroll: 'torah',
-              type: 'Main',
+              type: 'מפטיר',
             },
             {
               aliyot: [
                 {
                   end: {
                     b: 1,
-                    c: 56,
-                    scroll: 'esther',
-                    v: 8,
+                    c: 58,
+                    scroll: 'isaiah',
+                    v: 14,
                   },
                   index: undefined,
                   start: {
                     b: 1,
-                    c: 55,
-                    scroll: 'esther',
-                    v: 6,
+                    c: 57,
+                    scroll: 'isaiah',
+                    v: 14,
                   },
                 },
               ],
-              id: '2024-08-13:mincha,haftara',
+              id: '2023-09-25:shacharis,haftara',
               leining: [Circular],
-              scroll: 'esther',
+              scroll: 'isaiah',
               type: 'הפטרה',
             },
           ],
         },
-      ],
-      title: 'תשעה באב',
-    }
-
-## generates שבת ראש חודש חנוכה
-
-> Snapshot 1
-
-    {
-      id: '2021-12-04',
-      leinings: [
         {
           date: [Circular],
-          id: 'שחרית',
-          isParsha: true,
+          id: 'מנחה',
+          isParsha: false,
           runs: [
             {
               aliyot: [
                 {
                   end: {
-                    b: 1,
-                    c: 41,
+                    b: 3,
+                    c: 18,
                     scroll: 'torah',
-                    v: 14,
+                    v: 5,
                   },
                   index: 1,
                   start: {
-                    b: 1,
-                    c: 41,
+                    b: 3,
+                    c: 18,
                     scroll: 'torah',
                     v: 1,
                   },
                 },
                 {
                   end: {
-                    b: 1,
-                    c: 41,
+                    b: 3,
+                    c: 18,
                     scroll: 'torah',
-                    v: 38,
+                    v: 21,
                   },
                   index: 2,
                   start: {
-                    b: 1,
-                    c: 41,
-                    scroll: 'torah',
-                    v: 15,
-                  },
-                },
-                {
-                  end: {
-                    b: 1,
-                    c: 41,
-                    scroll: 'torah',
-                    v: 52,
-                  },
-                  index: 3,
-                  start: {
-                    b: 1,
-                    c: 41,
-                    scroll: 'torah',
-                    v: 39,
-                  },
-                },
-                {
-                  end: {
-                    b: 1,
-                    c: 42,
-                    scroll: 'torah',
-                    v: 18,
-                  },
-                  index: 4,
-                  start: {
-                    b: 1,
-                    c: 41,
-                    scroll: 'torah',
-                    v: 53,
-                  },
-                },
-                {
-                  end: {
-                    b: 1,
-                    c: 43,
-                    scroll: 'torah',
-                    v: 15,
-                  },
-                  index: 5,
-                  start: {
-                    b: 1,
-                    c: 42,
+                    b: 3,
+                    c: 18,
                     scroll: 'torah',
-                    v: 19,
+                    v: 6,
                   },
                 },
                 {
                   end: {
-                    b: 1,
-                    c: 44,
+                    b: 3,
+                    c: 18,
                     scroll: 'torah',
-                    v: 17,
+                    v: 30,
                   },
-                  index: 6,
+                  index: 'Maftir',
                   start: {
-                    b: 1,
-                    c: 43,
+                    b: 3,
+                    c: 18,
                     scroll: 'torah',
-                    v: 16,
+                    v: 22,
                   },
                 },
               ],
-              id: '2021-12-04:shacharis,main',
+              id: '2023-09-25:mincha,main',
               leining: [Circular],
               scroll: 'torah',
               type: 'Main',
@@ -1078,73 +589,42 @@ Generated by [AVA](https://avajs.dev).
               aliyot: [
                 {
                   end: {
-                    b: 4,
-                    c: 28,
-                    scroll: 'torah',
-                    v: 15,
-                  },
-                  index: 7,
-                  start: {
-                    b: 4,
-                    c: 28,
-                    scroll: 'torah',
-                    v: 9,
-                  },
-                },
-              ],
-              id: '2021-12-04:shacharis,last-aliyah',
-              leining: [Circular],
-              scroll: 'torah',
-              type: 'שביעי',
-            },
-            {
-              aliyot: [
-                {
-                  end: {
-                    b: 4,
-                    c: 7,
-                    scroll: 'torah',
-                    v: 47,
+                    b: 1,
+                    c: 4,
+                    scroll: 'jonah',
+                    v: 11,
                   },
-                  index: 'Maftir',
+                  index: undefined,
                   start: {
-                    b: 4,
-                    c: 7,
-                    scroll: 'torah',
-                    v: 42,
+                    b: 1,
+                    c: 1,
+                    scroll: 'jonah',
+                    v: 1,
                   },
                 },
-              ],
-              id: '2021-12-04:shacharis,maftir',
-              leining: [Circular],
-              scroll: 'torah',
-              type: 'מפטיר',
-            },
-            {
-              aliyot: [
                 {
                   end: {
                     b: 1,
-                    c: 4,
-                    scroll: 'esther',
-                    v: 7,
+                    c: 7,
+                    scroll: 'micah',
+                    v: 20,
                   },
                   index: undefined,
                   start: {
                     b: 1,
-                    c: 2,
-                    scroll: 'esther',
-                    v: 14,
+                    c: 7,
+                    scroll: 'micah',
+                    v: 18,
                   },
                 },
               ],
-              id: '2021-12-04:shacharis,haftara',
+              id: '2023-09-25:mincha,haftara',
               leining: [Circular],
-              scroll: 'esther',
+              scroll: 'jonah',
               type: 'הפטרה',
             },
           ],
         },
       ],
-      title: 'פרשת מקץ',
+      title: 'יום כפור',
     }
diff --git a/src/calendar-model/generator.test.ts.snap b/src/calendar-model/generator.test.ts.snap
index 6fcf4a7a524272607c23dc1573caa0180bdbce53..08daf16d66202cdc6a71f6b936ad20a13b621fc6 100644
GIT binary patch
literal 4561
zcmV;?5iagQRzV<BZeeh9Xm4~Nb~6eC06%9Pk^+%}aR@iXV4?|JB%Lr#{BjWz9%E1Q
z)}t7SYafdU00000000BkoOyIy^>xQTzqibcc3IZGKEUi2SdteIw4~Gq8Zek83FMHI
zjHMA8B9F+-h}eWepsa1$TGnR8iZI3m*>G5TFqE3~6dD>rsA*F;k6=#NOIaJ*CbV#9
z>i1^m&FJ?=vze({|MeTc`~BVfe#^bz-~HXEI|nun4flOBa@(#zG#DKUY;L(C5DJ9-
z(Lls7r_BlT2Zp)BoHlox6Xskn67pXa861vAZrIh|?~nQ~EBQ#pi}g?Vgti(u9q0r8
z5LhZaON8fwjaLTxqCz;$>gsAl1wutsu~aCvR!d(Zw0?gykoZyBy`sCPbH%Bh-K!9l
zLhJ<+&wN9HU?>>6A|iF5+pm!LRh6{gw%#&P{U_iThfI7UVV?eb;jn*;P!g@GswzY&
zLP3-X@nP)U%7kbVAcWn=S^-}a5ERlYs`FpbC)Dc&+$><XEL!Fo4MlnxUof)4AC3(A
z?f+1!?NRtEksJjrJQ9lJ4t?7V^$D$7fqDfD1x{4vkBK&KOngFJt-$FDoFxgC%Y&!d
zLw2E(7`&U5*x;23@u<~QQik|lN2*Ot46(jJg)gfRQel@0f2T_0r^`dFzpcUtD(D)V
zroq=W3F37@ZqeX-8tm5Kpa$p?q{Ia|R)<a<*6DDy4&Rp{6)wnr9iGtP7dljUpvxmc
zs$6S9vuEs5PjbdQ{-NNO;ixpxO0YlCY)bBz-pHW8Z_pnOMwV~#2SXCZ6X^>N4-F;v
z%y8I0DDTARmaCk7q^-9*am*Uc$E=nG%o>OW!-s2FsX1%zHn*G8*4}o^dn6z8TGN_0
z=pTss!~V?nd4dstFq?tnwt;izc#44s^D(eK#lTI$P~V`xD0Axb7P!>nHsv&8`jx|>
zJO<1syj@;c<Anh)Z1=*mR;=+sw{N}!@<^Ua8Suf7B;=EYcKYCll2EB6q`m2bcYV-Q
z0_T>@7p{~Y<c%e8TM0Za30BJv(t{|sM!^~M_O4#zyuj7LXs~Z2Vwl^_$zF4-(HU<|
z#Knb3$Q#{m`AJ89+T5BzI0JoTj~g*<j;3HH6ByOOtW1ZQaxgp0u>?kQEL-Kq>@de2
z%uE8IJ6cw|5i==oKVxYrwL`=FK|5-_?MHfz^G7yq41^<AsNWtR2fJmDLpo&VNT@$B
z5DW$Sdo7x?$J}L3o8#t$VeX8*<CxXQPIJm`Ct_O0DVw&0ZKLhhc(y6Cr6wHt9ciZQ
z=*0WUupO~^v)eO?SSpRp{5PC1cbemdxixO$*t|6&(t>8qX?x;QCf%CKz>t4qU}*DM
zmkb6X0V5iSL?g!4fpBnOixC|R7~w#4BpeF#8^O@PaCnnH8XOKSH-aG};Ex1{wiw}n
zzu&)cC}6~%rlXyE%vp2F+-sP7E!t*|r_jzjW3<!z-Qv>Dt`(gtPO%;1eR<Q)B`*7I
zXY-GMnT>SDDAH?*H&e?6)ClOx!ZdT`fM=)Ufcj<u*9o}okd`q4vmz4@EVW}snGkzK
zg1Egb9C}w3r*~ySoM|;xTf>L~-#J7Y#}xR90`DnV>0G%AH7cB-LO_MvWd`V`a}TQU
zhzbW(&@?zsW`J%wcYy|9(qL1Z1^!fqxOsXkVE#(WJ7C(2s>s~zcs&oZjI?GA`6JOz
z3+mEb072Vhj+)b!b4{`F{CsR|Szzdj#~&m4nAe)tyxjQXmBW$25m_iB9onwLtPaoV
zpnBj`4-9+YZci3EWKqu7JXz>asTZofndy*nrWelfW;y=3*p1QEYpe~7L<8aB(D0@$
zhB;$yi$@~6HR*~(M|P(}OgV^YbJP_sm-VE>Oq<(MP;QR1Y-M^>Qddf7c394`Rq0Ui
zxEya!xR}ne)#*`_G1OT6z0xt3#x=dh*?~|X5{x9n_-L=WExq^=>8a67jEK$jE<}uu
zolhIa%?WdlIbrTf>fCA%P9ko%rNr&M<}P!mIc-J0t>&HP-gyb5c;xoIQ_RS{s&hq8
zXIGECkMGYraxYEu26mKq1$YbiSKt#XO(3$w@mPSYb^_#S$pASZoB%m05&=?uT)>k8
zUdx_R`dGkc0$Sx5>I#Tzw*sdq@D*9qm84KNDG*U$n=HDdFs3o56r8B~`@*5WDID6O
zrlCg48Wny=&5{;7TZQ#1d_~RTVK=HUsAfDv&U;pqo*#x)dtEshw7b>BI(spmL32dQ
zwD?xje^-OG8eFcyRt+AOnU0%+y%0}}{re$uv`mL{vZu#_It=S@s}5G)>s1+2=7M-V
zv9#FH9=O~CH{_Zgo69#n7WWQCreH7Ro8C#7RmAj;l5cuPvZ=TUv19YGt~J%Vz!kxv
zA^+g=L?erVfk<>PAk#({CER9CTXE73Q0IB!A}`$Ng$KNuS(f&)7hd;5jStSql2=l`
z<%4hgG7%}CP#*HZqrNP;Bv)dhqpR0gw|ThVN*Byn9AP>^wMOIV42f*Dbf*Hw9A-9V
z(+i1Zwe(2BV@dL|81@(mrjyYq7tuLBLk4I(o|xHbPV|~n3lOYSe4H#KNz!z$xh+nS
zqA3i?zK1fW%^$dlk#?|{#Av0pW4c$`+wJbWiBW0Na68}~0G<bancF4WJI*CqZSoTB
z3<2u|^k-*0*Bs(e-xY9&Eb1+co9rw6678jQ2^8hG0`x4GXNr{>sZ%mB1Se{DD2V_c
z`+bp;h~hUZ@Fxn~rNB!H{5E?c<ro!~tFTsu%__{uiIkEB;_HvpJl%49krmr5I|ja<
zkAY1o1{Q??SW~P)ot7m^oUOrn4Yp{oSIZP73UfQ@eQ-;P51zL2xKptN@}%t`CI8#e
zEeTI265Dp$?SngdT!1kLu-%+YoED7~U%1PhGe@mMqvd+X4Rh4oYL2@7qIzzT{o*N|
zUETI_dMIzdSfBnSY^U`S@G9_bZa(tYj*m2wKJr`v7Yev4yN|p@!1n~)`#Jf@CkpqG
z|D4uGDhl{A`^a2eV~yhq*C}wW0(}a6UxBBxxI)KmyszZ%*Q`a7uU{)4@^1=+qV^4l
zypA%FPGyM-4QeJglJ+uezGsNv-6TB2xSgCz?8BycS)0ro(ECjBH(*b}B|d3(-v5;n
zA9q|Wc8Sj$>2{u4u7I^|TC<h+9IHU50&A2kQ7L)96C1b@#YsEF9?dzA4k}JfPo)*E
z<7DI;D%_O4rpL-`+^fRhs_=;lM`W+*IY)!@H5kxfN`w7bZghM?e_4aqHTXn>lXSQ^
zOHGgCNv_G~s-P*k+KZflxF_Em47XW19r%4$2Eu_&1s(aH&Bw(06cdY>B>AsGXS0||
z5}(l8J+RCJU-H1s*=~CFd0>B*n;z}g9{AJ)Cwk%1jF&k+q5QEIwn{>kS#uDs8=o<!
z3dC-0cahF^`Nn6g*PMyV&m_w!oH1*cZ+mRHi8x|5r&Ir&UF2Y&`lp<mqV1M_3()BQ
z=c$ZD{6BGCwZ*7)-!W%yHTM|ilsRFJ#Tq-!32VyIFoJItlM!@vc6E2ISXnS5*lo_4
zd#pE_HSaO+wwLg8zzez6UcBPeUX%*3Zg5UM?AnVe`(4(ht-ZKfz_kJ_{%+j|&E!^l
zagTGg^iuL_sUlf>@r7jVg>|d5MS;;cM}8-J%Aiz*Y88%Cp-+Wdv)5kSufoGBJgb7D
z!7<ruFRVlG#TtB5gIyXtlWXn8NBP!X#Ftc&!|n<B)?T>HDthh31^L!qq#L^8)m}vN
zWiD>>a*Dzw*92_w{Hjr>b+|)^13KV=ZV&W(U@}`!e%b>EvXx(a<^eTZ`Nb+PoR)X_
zg;lBO)DFx#XTsUoUA{YLS(S?O<+sP8h~1vCQsQ#t>X8vM=5`0MGg++RlwBArWyH={
z_??Y~(kWNTg;iLZg0Q9HI=0ysy2>q#)$<Ux)MN}X7B2=#7f;*Q%qyFi>W!(1wJbHc
z6<kdAT2{u(CTAB?c64g+o-}vZY4&j=&L`q*#z~-^mJHlhvE{(X(2#LnEH19~M+3&N
z?Jlj_%3QwQF{aZ6azF5$`~!K)&Xm91nfrXc-AR;CzLwj;{(a|Q-{BnW^@{{tDj*cE
zb^MF02Ymf$0S5%UDZs11F>(MsYJoU)dTKR-MRPKYn7PNCvZsD;E(iTH)7Ck}v<~O4
z)o0FHHO`iM%dT_8t+P5ls@kjqyA`-!fyXkY84?in#|k{7!1I#$vh?2)z2amP>Q#sE
zSVb4}z9qWJsf5_?d`sl{Hx>TVVl?pzh_7jIL)PjCk3~u5H2510expH^4n1;apveXM
zst(`KVY3bo=<u`-AIPwF7p&F;&GDGh=YeZIuv4ytINAk!!UI3?z$=!h7nXZrgI9vB
zaIH_>p3!d?`q78Xqbh}XFr_bVe2ag61S@9mBl*~y`NJdYGn^t=EVG)J-LK_a-;m*p
zq)H(?zI+WYpfV$7dATpoG)>x1l`4feHE)~qUmj=VV{E2xm@0)B%-`O;KW+;7AnJqb
zd~o|Aed9j3!v}jae%w?YKi4Vye6U{<ZB8%xln;I;iFTwF)n4$yK_9&3gI`IIV`Rut
zwkQA82ciVZq>rAu(ul{{spZ8>5}tZpiQ~_sCC&l%t`ZWi|L0aScI*|U*t6{%*H@Iz
zzbXH^^E-z9v(ki`AC)?4-Y=EHMoU>j>WgKGu%T@!gX_y+ybK;H%XR?Po-Ts}W$=d8
zSGgo!>Jo1#hqiL)E{6+baaVb!Hc$>j<#0ne%*x``F7bWku)iGsp&UMt#h1FowF)S$
zfQ||{y+RVNcZpwI0hd)kr~<ah;w>)mJr(dk1^l=IUX{fSm-xpO@Y$iBYbxR7N=f`!
zm-tzga9$<&E8#j>`~;WyL?!H~ga<3(d0D*ECH`I|d{haZDmb!A67P12pIQZHRKX=x
zaFr~+DjkKc6ynyZq_0r}p?;Yd2SfdV&Gs+NTAJ1sQ3^tjME&7tN_QXR(Vb!=jOq;C
zU0j`ecQM2*nYw!{kM82vwVAr>Sdx2pu_$rTk__G5oJV&a8}XN!x_d9@?yPvSKFLkm
zYclkDVNI^RdMj+eO__RoH0RzDtMA=R-L);vclB*pnxVTt%DFpf1Ru%N>pMC38Xv*d
z+6=v2P@89OH>T;$C-i-_u)h|buZ0h4VM(3jKzy#F=?QhPq7MF`4mQ@oEi%NNb-kkw
z?yiHst^>0UK9wQv`_bBZXs(BzdN{8huBw+H<u1tW_3-EQFjo&x)Wcgcq|ycX?|RT0
zpsfK`H^5gLGS`7ysqF^X(g52U;NAv!PKGRTLH?xyK5PJQBN&aawo!uAxFBC^guX_&
zwh<;8;V~If>w^5e5ngPBj~b!02~KK~AayRt*-fy%2?m<r`X;zbhBUY!k2k@SO>nRY
z{-X&Rn<Yr23)0mLYnow0GX$IAPi07}3-ZHexUU(WYKC7ngVG{F+FX#97C52>dRyS)
z7T7F9j&MOnTVSdM9&CZ1w!nun<Vg321FcZe3dgj<8LiOQDnX8OL9T6u8(U#VD?Ho^
zFUpYPU67Aj;p0}QZiD07V11heInf0fXoI0PxVa5x+u%tVvfKqZ*aok)!6%kzJFID!
zASbyX8`|N^?J(R9x3$B4GUQ|z<f(S}Sv$Ph4xhEd5gihw#|7!_fG>2wWgQUifJqs$
z(gk^-1NL>mfev`P1Ii2uvf2e%X21ys{JsH~8}MBjvL;=MZJwJI8<Qkt{)4{wgX#hf
zoZ{+awEy2%Di%X&*<vX5E{4)2i=ni9F_bnghSHkFP};s2N}Co#>5+?}v?H@p*Mo%8
zwjz3@;wa7Hk;Fnudkaa$I$A3W)Ou<$wJx}nY7S?B^~F$HXhc0MrFDy;v{1rwSV{}^
zzK5l>zQ8>rBXUXT=jxLdR4PBnOKFzXyP#5U7NwhleG4nCT@0l)@xL;4<|Tu{i2X;V
vVt->Q80b$HK18D7k-q3iIA9D9*#Dba2@woM1K|OGU*LZL4#(oH;#2?tTWsYN

literal 6335
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
BJ@Nnm

diff --git a/src/calendar-model/hebcal-conversions.ts b/src/calendar-model/hebcal-conversions.ts
index c9bd999f..92f2f274 100644
--- a/src/calendar-model/hebcal-conversions.ts
+++ b/src/calendar-model/hebcal-conversions.ts
@@ -1,7 +1,7 @@
 /** @fileoverview Contains generic helpers to convert between @hebcal types and our model types. */
 
 import { Aliyah, calculateNumVerses } from '@hebcal/leyning'
-import { Ref, RefWithScroll, ScrollName } from '../ref.ts'
+import { RefWithScroll, ScrollName } from '../ref.ts'
 import { LeiningAliyah } from './model-types.ts'
 
 /** Maps scrolls with multiple books to their book names as used in @hebcal. */
@@ -46,7 +46,10 @@ export function toLeiningAliyah(
 }
 
 /** Counts the number of פסוקים between two locations. Returns zero if both arguments are equal. */
-export function numVersesBetween(start: Ref, end: RefWithScroll): number {
+export function numVersesBetween(
+  start: RefWithScroll,
+  end: RefWithScroll
+): number {
   // Note that this is currently only used in חומש.
 
   // Construct a fake Aliyah to pass to hebcal's utility function.
@@ -54,12 +57,17 @@ export function numVersesBetween(start: Ref, end: RefWithScroll): number {
     b: `${start.v}:${start.c}`,
     e: `${end.c}:${end.v}`,
     // If the book isn't in our map, convert our lowercase name to @hebcal's title-case name
-    k: bookNames[end.scroll]?.[start.b] ?? toTitleCase(end.scroll),
+    k: getBookName(start),
   }
   // This helper includes the ending verse, which is not what we want here.
   return calculateNumVerses(aliyah) - 1
 }
 
+/** Gets a @hebcal-compatible book name. */
+export function getBookName(end: RefWithScroll): string {
+  return bookNames[end.scroll]?.[end.b] ?? toTitleCase(end.scroll)
+}
+
 function toTitleCase(str: string) {
   return str.charAt(0).toUpperCase() + str.slice(1)
 }
diff --git a/src/calendar-model/test-utils.ts b/src/calendar-model/test-utils.ts
index 853d9d68..29ccece7 100644
--- a/src/calendar-model/test-utils.ts
+++ b/src/calendar-model/test-utils.ts
@@ -1,4 +1,4 @@
-import { RenderedLineInfo } from './scroll-view-model'
+import { RenderedLineInfo } from './scroll-view-model.ts'
 
 export function renderLine(line: RenderedLineInfo): string {
   return `${line.labels}: ${line.text