Skip to content

Commit 714143e

Browse files
mjradwinmjradwin
committed
Daf Weekly
1 parent 64678c2 commit 714143e

6 files changed

+225
-64
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@hebcal/learning",
3-
"version": "1.4.0",
3+
"version": "1.5.0",
44
"description": "Daily learning schedules: Daf Yomi, Mishna Yomi, etc",
55
"main": "dist/index.js",
66
"module": "dist/index.mjs",

‎src/dafWeekly.js

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
import {greg} from '@hebcal/core';
2+
import {shas0 as shas, DafPage, DafPageEvent} from './dafyomi';
3+
import {getAbsDate, checkTooEarly} from './common';
4+
5+
const startDate = new Date(2005, 2, 6);
6+
export const dafWeeklyStart = greg.greg2abs(startDate);
7+
8+
const numDays = 2711 * 7;
9+
10+
/**
11+
* Daf-a-Week
12+
* @param {HDate|Date|number} date - Hebrew or Gregorian date
13+
* @return {DafPage}
14+
*/
15+
export function dafWeekly(date) {
16+
const abs = getAbsDate(date);
17+
checkTooEarly(abs, dafWeeklyStart, 'Daf-a-Week');
18+
19+
const dayNum = (abs - dafWeeklyStart) % numDays;
20+
const weekNum = Math.trunc(dayNum / 7);
21+
22+
// Find the daf
23+
let total = 0;
24+
let blatt = 0;
25+
let count = -1;
26+
let j = 0;
27+
const dafcnt = 40;
28+
while (j < dafcnt) {
29+
count++;
30+
total = total + shas[j].blatt - 1;
31+
if (weekNum < total) {
32+
blatt = (shas[j].blatt + 1) - (total - weekNum);
33+
// fiddle with the weird ones near the end
34+
switch (count) {
35+
case 36:
36+
blatt = blatt + 21;
37+
break;
38+
case 37:
39+
blatt = blatt + 24;
40+
break;
41+
case 38:
42+
blatt = blatt + 32;
43+
break;
44+
default:
45+
break;
46+
}
47+
// Bailout
48+
j = 1 + dafcnt;
49+
}
50+
j++;
51+
}
52+
return new DafPage(shas[count].name, blatt);
53+
}
54+
55+
/**
56+
* Event wrapper around a daily weekly
57+
*/
58+
export class DafWeeklyEvent extends DafPageEvent {
59+
/**
60+
* @param {HDate} date
61+
* @param {DafPage} daf
62+
*/
63+
constructor(date, daf) {
64+
super(date, daf);
65+
this.alarm = false;
66+
this.category = 'Daf Weekly';
67+
}
68+
/** @return {string[]} */
69+
getCategories() {
70+
return ['dafWeekly'];
71+
}
72+
}

‎src/dafWeekly.spec.js

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import test from 'ava';
2+
import {HDate} from '@hebcal/core';
3+
import {dafWeekly, DafWeeklyEvent} from './dafWeekly';
4+
5+
test('dafWeekly', (t) => {
6+
const daf1 = dafWeekly(new Date(2015, 8, 26));
7+
t.is(daf1.blatt, 88);
8+
t.is(daf1.name, 'Yoma');
9+
const daf2 = dafWeekly(new Date(2015, 8, 27));
10+
t.is(daf2.blatt, 2);
11+
t.is(daf2.name, 'Sukkah');
12+
const daf3 = dafWeekly(new Date(2057, 1, 17));
13+
t.is(daf3.blatt, 73);
14+
t.is(daf3.name, 'Niddah');
15+
});
16+
17+
test('dafWeekly-render', (t) => {
18+
const hd = new HDate(new Date(2008, 4, 9));
19+
const daf = dafWeekly(hd);
20+
const ev = new DafWeeklyEvent(hd, daf);
21+
t.is(ev.render('en'), 'Shabbat 104');
22+
t.is(ev.render('a'), 'Shabbos 104');
23+
t.is(ev.render('he'), 'שַׁבָּת דף ק״ד');
24+
t.is(ev.render('he-x-NoNikud'), 'שבת דף ק״ד');
25+
t.is(ev.url(), 'https://www.sefaria.org/Shabbat.104a?lang=bi');
26+
t.deepEqual(ev.getCategories(), ['dafWeekly']);
27+
});

‎src/dafyomi.js

+107-63
Original file line numberDiff line numberDiff line change
@@ -72,68 +72,16 @@ export const shas0 = [
7272
});
7373

7474
/**
75-
* Returns the Daf Yomi for given date
75+
* Represents a tractate and page number
7676
*/
77-
export class DafYomi {
77+
export class DafPage {
7878
/**
7979
* Initializes a daf yomi instance
80-
* @param {Date|HDate|number} date Gregorian or Hebrew date
80+
* @param {string} name
81+
* @param {number} blatt
8182
*/
82-
constructor(date) {
83-
const cday = getAbsDate(date);
84-
checkTooEarly(cday, osday, 'Daf Yomi');
85-
let cno;
86-
let dno;
87-
if (cday >= nsday) { // "new" cycle
88-
cno = 8 + Math.floor( (cday - nsday) / 2711 );
89-
dno = (cday - nsday) % 2711;
90-
} else { // old cycle
91-
cno = 1 + Math.floor( (cday - osday) / 2702 );
92-
dno = (cday - osday) % 2702;
93-
}
94-
95-
// Find the daf taking note that the cycle changed slightly after cycle 7.
96-
97-
let total = 0;
98-
let blatt = 0;
99-
let count = -1;
100-
101-
// Fix Shekalim for old cycles
102-
const shortShekalim = cno <= 7;
103-
const shas = shortShekalim ? shas0.slice() : shas0;
104-
if (shortShekalim) {
105-
shas[4] = {name: 'Shekalim', blatt: 13};
106-
}
107-
108-
// Find the daf
109-
let j = 0;
110-
const dafcnt = 40;
111-
while (j < dafcnt) {
112-
count++;
113-
total = total + shas[j].blatt - 1;
114-
if (dno < total) {
115-
blatt = (shas[j].blatt + 1) - (total - dno);
116-
// fiddle with the weird ones near the end
117-
switch (count) {
118-
case 36:
119-
blatt = blatt + 21;
120-
break;
121-
case 37:
122-
blatt = blatt + 24;
123-
break;
124-
case 38:
125-
blatt = blatt + 32;
126-
break;
127-
default:
128-
break;
129-
}
130-
// Bailout
131-
j = 1 + dafcnt;
132-
}
133-
j++;
134-
}
135-
136-
this.name = shas[count].name;
83+
constructor(name, blatt) {
84+
this.name = name;
13785
this.blatt = blatt;
13886
}
13987
/**
@@ -166,6 +114,81 @@ export class DafYomi {
166114
}
167115
}
168116

117+
/**
118+
* @private
119+
* @param {Date|HDate|number} date Gregorian or Hebrew date
120+
* @return {DafPage}
121+
*/
122+
function calculateDaf(date) {
123+
const cday = getAbsDate(date);
124+
checkTooEarly(cday, osday, 'Daf Yomi');
125+
let cno;
126+
let dno;
127+
if (cday >= nsday) { // "new" cycle
128+
cno = 8 + Math.floor( (cday - nsday) / 2711 );
129+
dno = (cday - nsday) % 2711;
130+
} else { // old cycle
131+
cno = 1 + Math.floor( (cday - osday) / 2702 );
132+
dno = (cday - osday) % 2702;
133+
}
134+
135+
// Find the daf taking note that the cycle changed slightly after cycle 7.
136+
137+
let total = 0;
138+
let blatt = 0;
139+
let count = -1;
140+
141+
// Fix Shekalim for old cycles
142+
const shortShekalim = cno <= 7;
143+
const shas = shortShekalim ? shas0.slice() : shas0;
144+
if (shortShekalim) {
145+
shas[4] = {name: 'Shekalim', blatt: 13};
146+
}
147+
148+
// Find the daf
149+
let j = 0;
150+
const dafcnt = 40;
151+
while (j < dafcnt) {
152+
count++;
153+
total = total + shas[j].blatt - 1;
154+
if (dno < total) {
155+
blatt = (shas[j].blatt + 1) - (total - dno);
156+
// fiddle with the weird ones near the end
157+
switch (count) {
158+
case 36:
159+
blatt = blatt + 21;
160+
break;
161+
case 37:
162+
blatt = blatt + 24;
163+
break;
164+
case 38:
165+
blatt = blatt + 32;
166+
break;
167+
default:
168+
break;
169+
}
170+
// Bailout
171+
j = 1 + dafcnt;
172+
}
173+
j++;
174+
}
175+
return new DafPage(shas[count].name, blatt);
176+
}
177+
178+
/**
179+
* Returns the Daf Yomi for given date
180+
*/
181+
export class DafYomi extends DafPage {
182+
/**
183+
* Initializes a daf yomi instance
184+
* @param {Date|HDate|number} date Gregorian or Hebrew date
185+
*/
186+
constructor(date) {
187+
const d = calculateDaf(date);
188+
super(d.name, d.blatt);
189+
}
190+
}
191+
169192
const dafYomiSefaria = {
170193
'Berachot': 'Berakhot',
171194
'Rosh Hashana': 'Rosh Hashanah',
@@ -180,14 +203,14 @@ const dafYomiSefaria = {
180203
};
181204

182205
/**
183-
* Event wrapper around a DafYomi instance
206+
* Event wrapper around a DafPage instance
184207
*/
185-
export class DafYomiEvent extends Event {
208+
export class DafPageEvent extends Event {
186209
/**
187210
* @param {HDate} date
211+
* @param {DafPage} daf
188212
*/
189-
constructor(date) {
190-
const daf = new DafYomi(date.greg());
213+
constructor(date, daf) {
191214
super(date, daf.render('en'), flags.DAF_YOMI);
192215
this.daf = daf;
193216
}
@@ -197,7 +220,7 @@ export class DafYomiEvent extends Event {
197220
* @return {string}
198221
*/
199222
render(locale) {
200-
return Locale.gettext('Daf Yomi', locale) + ': ' + this.daf.render(locale);
223+
return this.daf.render(locale);
201224
}
202225
/**
203226
* Returns Daf Yomi name without the 'Daf Yomi: ' prefix (e.g. "Pesachim 107").
@@ -223,6 +246,27 @@ export class DafYomiEvent extends Event {
223246
return `https://www.sefaria.org/${name}.${blatt}a?lang=bi`;
224247
}
225248
}
249+
}
250+
251+
/**
252+
* Event wrapper around a DafYomi instance
253+
*/
254+
export class DafYomiEvent extends DafPageEvent {
255+
/**
256+
* @param {HDate} date
257+
*/
258+
constructor(date) {
259+
const daf = new DafYomi(date.greg());
260+
super(date, daf);
261+
}
262+
/**
263+
* Returns Daf Yomi name including the 'Daf Yomi: ' prefix (e.g. "Daf Yomi: Pesachim 107").
264+
* @param {string} [locale] Optional locale name (defaults to active locale).
265+
* @return {string}
266+
*/
267+
render(locale) {
268+
return Locale.gettext('Daf Yomi', locale) + ': ' + this.daf.render(locale);
269+
}
226270
/** @return {string[]} */
227271
getCategories() {
228272
return ['dafyomi'];

‎src/register.js

+10
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {chofetzChaim, ChofetzChaimEvent, chofetzChaimStart} from './chofetzChaim
99
import {dailyRambam1, DailyRambamEvent, rambam1Start} from './rambam';
1010
import {shemiratHaLashon, ShemiratHaLashonEvent, shemiratHaLashonStart} from './shemiratHaLashon';
1111
import {dailyPsalms, PsalmsEvent} from './psalms';
12+
import {dafWeekly, DafWeeklyEvent, dafWeeklyStart} from './dafWeekly';
1213
import poHe from './he.po.json';
1314
import poAshkenazi from './ashkenazi.po.json';
1415

@@ -93,6 +94,15 @@ DailyLearning.addCalendar('psalms', function(hd) {
9394
return new PsalmsEvent(hd, reading);
9495
});
9596

97+
DailyLearning.addCalendar('dafWeekly', function(hd) {
98+
const abs = hd.abs();
99+
if (abs < dafWeeklyStart) {
100+
return null;
101+
}
102+
const daf = dafWeekly(abs);
103+
return new DafWeeklyEvent(hd, daf);
104+
});
105+
96106
Locale.addTranslations('he', poHe);
97107
Locale.addTranslations('h', poHe);
98108
Locale.addTranslations('ashkenazi', poAshkenazi);

‎src/register.spec.js

+8
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,11 @@ test('lookup', (t) => {
88
t.is(typeof ev, 'object');
99
t.is(ev.getDesc(), 'Psalms 83-87');
1010
});
11+
12+
test('dafWeekly', (t) => {
13+
const hd = new HDate(17, 'Sivan', 5783);
14+
const ev = DailyLearning.lookup('dafWeekly', hd);
15+
t.is(typeof ev, 'object');
16+
t.is(ev.getDesc(), 'Ketubot 39');
17+
t.deepEqual(ev.getCategories(), ['dafWeekly']);
18+
});

0 commit comments

Comments
 (0)