@hebcal/rest-api 7.1.3 → 7.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/classic-rest-api.d.ts +27 -4
- package/dist/esm/classic-rest-api.js +52 -31
- package/dist/esm/classic-rest-api.js.map +1 -1
- package/dist/esm/common.d.ts +2 -2
- package/dist/esm/common.js +5 -5
- package/dist/esm/common.js.map +1 -1
- package/dist/esm/csv.d.ts +2 -2
- package/dist/esm/csv.js +11 -11
- package/dist/esm/csv.js.map +1 -1
- package/dist/esm/holiday.js +1 -2
- package/dist/esm/holiday.js.map +1 -1
- package/dist/esm/isTimedEvent.d.ts +8 -0
- package/dist/esm/isTimedEvent.js +9 -0
- package/dist/esm/isTimedEvent.js.map +1 -0
- package/dist/esm/location.d.ts +1 -1
- package/dist/esm/location.js +11 -8
- package/dist/esm/location.js.map +1 -1
- package/dist/esm/url.js +2 -4
- package/dist/esm/url.js.map +1 -1
- package/package.json +12 -11
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Event } from '@hebcal/core/dist/esm/event';
|
|
2
|
-
import { TachanunResult } from '@hebcal/core/dist/esm/tachanun';
|
|
3
|
-
import { StringMap } from '@hebcal/leyning/dist/esm/types';
|
|
4
|
-
import { RestApiOptions } from './common.js';
|
|
1
|
+
import type { Event } from '@hebcal/core/dist/esm/event';
|
|
2
|
+
import type { TachanunResult } from '@hebcal/core/dist/esm/tachanun';
|
|
3
|
+
import type { AliyotMap, Leyning, StringMap } from '@hebcal/leyning/dist/esm/types';
|
|
4
|
+
import type { RestApiOptions } from './common.js';
|
|
5
5
|
import type { LocationPlainObj } from './location.js';
|
|
6
6
|
/**
|
|
7
7
|
* A single event as rendered for the classic Hebcal.com JSON API, as
|
|
@@ -117,3 +117,26 @@ export declare function eventsToClassicApiHeader(events: Event[], options: RestA
|
|
|
117
117
|
* @returns the rendered API item
|
|
118
118
|
*/
|
|
119
119
|
export declare function eventToClassicApiObject(ev: Event, options: RestApiOptions, leyning?: boolean): ClassicApiItem;
|
|
120
|
+
/**
|
|
121
|
+
* Adds each aliyah to `result`, keying the maftir under `maftir` and the
|
|
122
|
+
* numbered aliyot under their number.
|
|
123
|
+
* @param result destination map that aliyah strings are written into
|
|
124
|
+
* @param aliyot map of aliyah number (or `M` for maftir) to aliyah
|
|
125
|
+
* @returns the same `result` map, now populated with the aliyot
|
|
126
|
+
*/
|
|
127
|
+
export declare function formatAliyot(result: StringMap, aliyot: AliyotMap): StringMap;
|
|
128
|
+
/**
|
|
129
|
+
* Appends the reason text for special readings (aliyot, maftir, and the
|
|
130
|
+
* various haftarah traditions) onto the corresponding entries in `result`.
|
|
131
|
+
* @param result destination map whose entries are annotated with reasons
|
|
132
|
+
* @param reason map of reading key to its reason text
|
|
133
|
+
* @returns the same `result` map, now annotated with reasons
|
|
134
|
+
*/
|
|
135
|
+
export declare function formatReasons(result: StringMap, reason: StringMap): StringMap;
|
|
136
|
+
/**
|
|
137
|
+
* Formats a Torah reading into a flat map of Torah, haftarah, and aliyah
|
|
138
|
+
* strings suitable for the classic REST API response.
|
|
139
|
+
* @param reading the leyning to format
|
|
140
|
+
* @returns a map of reading keys to their formatted display strings
|
|
141
|
+
*/
|
|
142
|
+
export declare function formatLeyningResult(reading: Leyning): StringMap;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { HDate, gematriya, isoDateString } from '@hebcal/hdate';
|
|
2
2
|
import { Zmanim } from '@hebcal/core/dist/esm/zmanim';
|
|
3
|
-
import { flags } from '@hebcal/core/dist/esm/event';
|
|
4
3
|
import { version } from '@hebcal/core/dist/esm/pkgVersion';
|
|
5
4
|
import { Locale } from '@hebcal/core/dist/esm/locale';
|
|
6
5
|
import { reformatTimeStr } from '@hebcal/core/dist/esm/reformatTimeStr';
|
|
@@ -13,6 +12,7 @@ import { getCalendarTitle, getEventCategories, shouldRenderBrief, } from './comm
|
|
|
13
12
|
import { appendIsraelAndTracking } from './url.js';
|
|
14
13
|
import { locationToPlainObj } from './location.js';
|
|
15
14
|
import { getHolidayDescription } from './holiday.js';
|
|
15
|
+
import { isTimedEvent } from './isTimedEvent.js';
|
|
16
16
|
import { holidayDesc as hdesc } from '@hebcal/core/dist/esm/staticHolidays';
|
|
17
17
|
function eventIsoDate(ev) {
|
|
18
18
|
return isoDateString(ev.greg());
|
|
@@ -65,51 +65,50 @@ export function eventsToClassicApiHeader(events, options) {
|
|
|
65
65
|
* @returns the rendered API item
|
|
66
66
|
*/
|
|
67
67
|
export function eventToClassicApiObject(ev, options, leyning = true) {
|
|
68
|
-
const
|
|
69
|
-
const eventTime = timedEv.eventTime;
|
|
70
|
-
const timed = Boolean(eventTime);
|
|
68
|
+
const timed = isTimedEvent(ev);
|
|
71
69
|
const hd = ev.getDate();
|
|
72
|
-
const dt = hd.greg();
|
|
73
70
|
const tzid = typeof options.location === 'object' ? options.location.getTzid() : 'UTC';
|
|
74
71
|
const date = timed
|
|
75
|
-
? Zmanim.formatISOWithTimeZone(tzid, eventTime)
|
|
76
|
-
: isoDateString(
|
|
72
|
+
? Zmanim.formatISOWithTimeZone(tzid, ev.eventTime)
|
|
73
|
+
: isoDateString(hd.greg());
|
|
77
74
|
const categories = getEventCategories(ev);
|
|
78
|
-
const mask = ev.getFlags();
|
|
79
75
|
let title = shouldRenderBrief(ev)
|
|
80
76
|
? ev.renderBrief(options.locale)
|
|
81
77
|
: ev.render(options.locale);
|
|
82
78
|
const desc = ev.getDesc();
|
|
83
79
|
const candles = desc === hdesc.HAVDALAH || desc === hdesc.CANDLE_LIGHTING;
|
|
84
80
|
if (candles) {
|
|
85
|
-
|
|
81
|
+
// Candle-lighting and Havdalah events are always TimedEvents
|
|
82
|
+
const time = reformatTimeStr(ev.eventTimeStr, 'pm', options);
|
|
86
83
|
title += ': ' + time;
|
|
87
84
|
}
|
|
85
|
+
// key order here determines key order in the serialized JSON
|
|
88
86
|
const result = {
|
|
89
|
-
title
|
|
90
|
-
date
|
|
87
|
+
title,
|
|
88
|
+
date,
|
|
89
|
+
...(!timed && { hdate: hd.toString() }),
|
|
90
|
+
category: categories[0],
|
|
91
91
|
};
|
|
92
|
-
if (!timed) {
|
|
93
|
-
result.hdate = hd.toString();
|
|
94
|
-
}
|
|
95
|
-
result.category = categories[0];
|
|
96
92
|
if (categories.length > 1) {
|
|
97
93
|
result.subcat = categories[1];
|
|
98
94
|
}
|
|
99
|
-
if (categories[0] === 'holiday' &&
|
|
95
|
+
if (categories[0] === 'holiday' && ev.hasFlag('CHAG')) {
|
|
100
96
|
result.yomtov = true;
|
|
101
97
|
}
|
|
102
98
|
if (title !== desc) {
|
|
103
99
|
result.title_orig = desc;
|
|
104
100
|
}
|
|
105
|
-
const
|
|
106
|
-
if (
|
|
107
|
-
|
|
101
|
+
const isMolad = ev.hasFlag('MOLAD');
|
|
102
|
+
if (!isMolad) {
|
|
103
|
+
const hebrew = ev.renderBrief('he-x-NoNikud');
|
|
104
|
+
if (hebrew) {
|
|
105
|
+
result.hebrew = hebrew;
|
|
106
|
+
}
|
|
108
107
|
}
|
|
109
108
|
if (!candles) {
|
|
110
109
|
if (leyning) {
|
|
111
110
|
const il = options.il;
|
|
112
|
-
const isParsha =
|
|
111
|
+
const isParsha = ev.hasFlag('PARSHA_HASHAVUA');
|
|
113
112
|
const reading = isParsha
|
|
114
113
|
? getLeyningForParshaHaShavua(ev, il)
|
|
115
114
|
: getLeyningForHoliday(ev, il);
|
|
@@ -131,7 +130,7 @@ export function eventToClassicApiObject(ev, options, leyning = true) {
|
|
|
131
130
|
result.link = appendIsraelAndTracking(url, Boolean(options.il), utmSource, utmMedium, utmCampaign);
|
|
132
131
|
}
|
|
133
132
|
}
|
|
134
|
-
if (
|
|
133
|
+
if (ev.hasFlag('OMER_COUNT')) {
|
|
135
134
|
const omerEv = ev;
|
|
136
135
|
result.omer = {
|
|
137
136
|
count: {
|
|
@@ -148,9 +147,8 @@ export function eventToClassicApiObject(ev, options, leyning = true) {
|
|
|
148
147
|
lamnatzeachLetter: omerEv.getLamnatzeachLetter(),
|
|
149
148
|
};
|
|
150
149
|
}
|
|
151
|
-
if (
|
|
152
|
-
const
|
|
153
|
-
const m = moladEv.molad;
|
|
150
|
+
if (isMolad) {
|
|
151
|
+
const m = ev.molad;
|
|
154
152
|
const hy = m.getYear();
|
|
155
153
|
result.molad = {
|
|
156
154
|
hy,
|
|
@@ -161,9 +159,8 @@ export function eventToClassicApiObject(ev, options, leyning = true) {
|
|
|
161
159
|
chalakim: m.getChalakim(),
|
|
162
160
|
instant: m.getInstant().toInstant().toJSON(),
|
|
163
161
|
};
|
|
164
|
-
delete result.hebrew;
|
|
165
162
|
}
|
|
166
|
-
if ((options.heDateParts && !timed) ||
|
|
163
|
+
if ((options.heDateParts && !timed) || ev.hasFlag('HEBREW_DATE')) {
|
|
167
164
|
const yy = hd.getFullYear();
|
|
168
165
|
const mm = hd.getMonthName();
|
|
169
166
|
const dd = hd.getDate();
|
|
@@ -177,15 +174,26 @@ export function eventToClassicApiObject(ev, options, leyning = true) {
|
|
|
177
174
|
if (typeof memo === 'string' && memo.length !== 0) {
|
|
178
175
|
result.memo = memo.normalize();
|
|
179
176
|
}
|
|
180
|
-
else
|
|
181
|
-
|
|
177
|
+
else {
|
|
178
|
+
// TimedEvent and FastDayEvent (not a TimedEvent) both carry linkedEvent
|
|
179
|
+
const linkedEvent = ev.linkedEvent;
|
|
180
|
+
if (linkedEvent) {
|
|
181
|
+
result.memo = linkedEvent.render(options.locale);
|
|
182
|
+
}
|
|
182
183
|
}
|
|
183
184
|
if (options.includeEvent) {
|
|
184
185
|
result.ev = ev;
|
|
185
186
|
}
|
|
186
187
|
return result;
|
|
187
188
|
}
|
|
188
|
-
|
|
189
|
+
/**
|
|
190
|
+
* Adds each aliyah to `result`, keying the maftir under `maftir` and the
|
|
191
|
+
* numbered aliyot under their number.
|
|
192
|
+
* @param result destination map that aliyah strings are written into
|
|
193
|
+
* @param aliyot map of aliyah number (or `M` for maftir) to aliyah
|
|
194
|
+
* @returns the same `result` map, now populated with the aliyot
|
|
195
|
+
*/
|
|
196
|
+
export function formatAliyot(result, aliyot) {
|
|
189
197
|
for (const [num, aliyah] of Object.entries(aliyot)) {
|
|
190
198
|
if (aliyah) {
|
|
191
199
|
const k = num === 'M' ? 'maftir' : num;
|
|
@@ -194,7 +202,14 @@ function formatAliyot(result, aliyot) {
|
|
|
194
202
|
}
|
|
195
203
|
return result;
|
|
196
204
|
}
|
|
197
|
-
|
|
205
|
+
/**
|
|
206
|
+
* Appends the reason text for special readings (aliyot, maftir, and the
|
|
207
|
+
* various haftarah traditions) onto the corresponding entries in `result`.
|
|
208
|
+
* @param result destination map whose entries are annotated with reasons
|
|
209
|
+
* @param reason map of reading key to its reason text
|
|
210
|
+
* @returns the same `result` map, now annotated with reasons
|
|
211
|
+
*/
|
|
212
|
+
export function formatReasons(result, reason) {
|
|
198
213
|
for (const num of ['7', '8', 'M']) {
|
|
199
214
|
if (reason[num]) {
|
|
200
215
|
const k = num === 'M' ? 'maftir' : num;
|
|
@@ -212,7 +227,13 @@ function formatReasons(result, reason) {
|
|
|
212
227
|
}
|
|
213
228
|
return result;
|
|
214
229
|
}
|
|
215
|
-
|
|
230
|
+
/**
|
|
231
|
+
* Formats a Torah reading into a flat map of Torah, haftarah, and aliyah
|
|
232
|
+
* strings suitable for the classic REST API response.
|
|
233
|
+
* @param reading the leyning to format
|
|
234
|
+
* @returns a map of reading keys to their formatted display strings
|
|
235
|
+
*/
|
|
236
|
+
export function formatLeyningResult(reading) {
|
|
216
237
|
const result = {};
|
|
217
238
|
if (reading.summary) {
|
|
218
239
|
result.torah = reading.summary;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classic-rest-api.js","sourceRoot":"","sources":["../../src/classic-rest-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"classic-rest-api.js","sourceRoot":"","sources":["../../src/classic-rest-api.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/common.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Event } from '@hebcal/core/dist/esm/event';
|
|
2
|
-
import { CalOptions } from '@hebcal/core/dist/esm/CalOptions';
|
|
1
|
+
import type { Event } from '@hebcal/core/dist/esm/event';
|
|
2
|
+
import type { CalOptions } from '@hebcal/core/dist/esm/CalOptions';
|
|
3
3
|
/**
|
|
4
4
|
* A simple string-to-string dictionary
|
|
5
5
|
*/
|
package/dist/esm/common.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { flags } from '@hebcal/core/dist/esm/event';
|
|
2
2
|
import { HDate } from '@hebcal/hdate';
|
|
3
3
|
import { makeAnchor } from './makeAnchor.js';
|
|
4
|
+
import { isTimedEvent } from './isTimedEvent.js';
|
|
4
5
|
/**
|
|
5
6
|
* Generates a base filename (without extension) for a calendar download,
|
|
6
7
|
* incorporating the year, date range, and/or location as available.
|
|
@@ -131,18 +132,17 @@ export const LEARNING_MASK = flags.DAF_YOMI |
|
|
|
131
132
|
* @returns `true` if the brief rendering should be used
|
|
132
133
|
*/
|
|
133
134
|
export function shouldRenderBrief(ev) {
|
|
134
|
-
if (ev
|
|
135
|
+
if (isTimedEvent(ev)) {
|
|
135
136
|
return true;
|
|
136
137
|
}
|
|
137
|
-
|
|
138
|
-
if (mask & flags.HEBREW_DATE) {
|
|
138
|
+
if (ev.hasFlag('HEBREW_DATE')) {
|
|
139
139
|
const hd = ev.getDate();
|
|
140
140
|
return hd.getDate() !== 1;
|
|
141
141
|
}
|
|
142
|
-
else if (
|
|
142
|
+
else if (ev.hasAnyFlag('DAF_YOMI', 'NACH_YOMI', 'MISHNA_YOMI', 'DAILY_LEARNING', 'YERUSHALMI_YOMI', 'SHABBAT_MEVARCHIM')) {
|
|
143
143
|
return true;
|
|
144
144
|
}
|
|
145
|
-
else if (
|
|
145
|
+
else if (ev.hasFlag('MINOR_FAST') &&
|
|
146
146
|
ev.getDesc().startsWith('Yom Kippur Katan')) {
|
|
147
147
|
return true;
|
|
148
148
|
}
|
package/dist/esm/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/common.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/common.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/csv.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Event } from '@hebcal/core/dist/esm/event';
|
|
2
|
-
import { RestApiOptions } from './common.js';
|
|
1
|
+
import type { Event } from '@hebcal/core/dist/esm/event';
|
|
2
|
+
import type { RestApiOptions } from './common.js';
|
|
3
3
|
/**
|
|
4
4
|
* The header row for an Outlook-compatible CSV document.
|
|
5
5
|
*/
|
package/dist/esm/csv.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { flags } from '@hebcal/core/dist/esm/event';
|
|
2
1
|
import { reformatTimeStr } from '@hebcal/core/dist/esm/reformatTimeStr';
|
|
3
|
-
import { getEventCategories, shouldRenderBrief
|
|
2
|
+
import { getEventCategories, shouldRenderBrief } from './common.js';
|
|
4
3
|
import { getHolidayDescription } from './holiday.js';
|
|
4
|
+
import { isTimedEvent } from './isTimedEvent.js';
|
|
5
5
|
/**
|
|
6
6
|
* The header row for an Outlook-compatible CSV document.
|
|
7
7
|
*/
|
|
@@ -43,19 +43,17 @@ export function eventToCsv(ev, options) {
|
|
|
43
43
|
let endTime = '';
|
|
44
44
|
let endDate = '';
|
|
45
45
|
let allDay = '"true"';
|
|
46
|
-
const
|
|
47
|
-
const timed = Boolean(timedEv.eventTime);
|
|
46
|
+
const timed = isTimedEvent(ev);
|
|
48
47
|
let subj = shouldRenderBrief(ev)
|
|
49
48
|
? ev.renderBrief(options.locale)
|
|
50
49
|
: ev.render(options.locale);
|
|
51
50
|
if (timed) {
|
|
52
|
-
const timeStr = reformatTimeStr(
|
|
51
|
+
const timeStr = reformatTimeStr(ev.eventTimeStr, ' PM', options);
|
|
53
52
|
endTime = startTime = `"${timeStr}"`;
|
|
54
53
|
endDate = date;
|
|
55
54
|
allDay = '"false"';
|
|
56
55
|
}
|
|
57
56
|
let loc = 'Jewish Holidays';
|
|
58
|
-
const mask = ev.getFlags();
|
|
59
57
|
if (timed && typeof options.location === 'object') {
|
|
60
58
|
const locationName = options.location.getShortName();
|
|
61
59
|
if (locationName) {
|
|
@@ -80,14 +78,16 @@ export function eventToCsv(ev, options) {
|
|
|
80
78
|
}
|
|
81
79
|
}
|
|
82
80
|
let memo0 = options.memo || ev.memo || getHolidayDescription(ev, true, options.locale);
|
|
83
|
-
|
|
84
|
-
|
|
81
|
+
// TimedEvent and FastDayEvent (not a TimedEvent) both carry linkedEvent
|
|
82
|
+
const linkedEvent = ev.linkedEvent;
|
|
83
|
+
if (!memo0 && linkedEvent !== undefined) {
|
|
84
|
+
memo0 = linkedEvent.render(options.locale);
|
|
85
85
|
}
|
|
86
86
|
const memo = memo0
|
|
87
87
|
.replaceAll(',', ';')
|
|
88
88
|
.replaceAll('"', "''")
|
|
89
89
|
.replaceAll('\n', ' / ');
|
|
90
|
-
const isChag =
|
|
90
|
+
const isChag = ev.hasFlag('CHAG');
|
|
91
91
|
const showTimeAs = timed || isChag ? 4 : 3;
|
|
92
92
|
return `"${subj}",${date},${startTime},${endDate},${endTime},${allDay},"${memo}","${showTimeAs}","${loc}"`;
|
|
93
93
|
}
|
|
@@ -99,7 +99,7 @@ export function eventToCsv(ev, options) {
|
|
|
99
99
|
* @returns the full CSV document, using CRLF line endings
|
|
100
100
|
*/
|
|
101
101
|
export function eventsToCsv(events, options) {
|
|
102
|
-
|
|
103
|
-
|
|
102
|
+
const lines = [CSV_HEADER, ...events.map(ev => eventToCsv(ev, options))];
|
|
103
|
+
return lines.join('\r\n') + '\r\n';
|
|
104
104
|
}
|
|
105
105
|
//# sourceMappingURL=csv.js.map
|
package/dist/esm/csv.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csv.js","sourceRoot":"","sources":["../../src/csv.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"csv.js","sourceRoot":"","sources":["../../src/csv.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/holiday.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { flags } from '@hebcal/core/dist/esm/event';
|
|
2
1
|
import { Locale } from '@hebcal/hdate';
|
|
3
2
|
import poEn from './en.po.js';
|
|
4
3
|
import poHe from './he.po.js';
|
|
@@ -21,7 +20,7 @@ Locale.addTranslations('he', poHe);
|
|
|
21
20
|
*/
|
|
22
21
|
export function getHolidayDescription(ev, firstSentence = false, locale) {
|
|
23
22
|
const localeName = Locale.isHebrewLocale(locale) ? 'he' : 'en';
|
|
24
|
-
const key = ev.
|
|
23
|
+
const key = ev.hasFlag('SHABBAT_MEVARCHIM')
|
|
25
24
|
? 'Shabbat Mevarchim Chodesh'
|
|
26
25
|
: ev.getDesc();
|
|
27
26
|
const str0 = Locale.lookupTranslation(MEMO_PREFIX + key, localeName) ??
|
package/dist/esm/holiday.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"holiday.js","sourceRoot":"","sources":["../../src/holiday.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"holiday.js","sourceRoot":"","sources":["../../src/holiday.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,eAAe,CAAC;AACrC,OAAO,IAAI,MAAM,YAAY,CAAC;AAC9B,OAAO,IAAI,MAAM,YAAY,CAAC;AAE9B,qEAAqE;AACrE,uEAAuE;AACvE,sDAAsD;AACtD,MAAM,WAAW,GAAG,OAAO,CAAC;AAE5B,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAEnC;;;;;;;;;;GAUG;AACH,MAAM,UAAU,qBAAqB,CACnC,EAAS,EACT,aAAa,GAAG,KAAK,EACrB,MAAe;IAEf,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,MAAM,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC;QACzC,CAAC,CAAC,2BAA2B;QAC7B,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC;IACjB,MAAM,IAAI,GACR,MAAM,CAAC,iBAAiB,CAAC,WAAW,GAAG,GAAG,EAAE,UAAU,CAAC;QACvD,MAAM,CAAC,iBAAiB,CAAC,WAAW,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC;QACjE,EAAE,CAAC;IACL,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IAC7B,IAAI,aAAa,IAAI,GAAG,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;YACf,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Event } from '@hebcal/core/dist/esm/event';
|
|
2
|
+
import type { TimedEvent } from '@hebcal/core/dist/esm/TimedEvent';
|
|
3
|
+
/**
|
|
4
|
+
* Narrows an `Event` to a `TimedEvent` by duck-typing on `eventTime`, which
|
|
5
|
+
* (unlike `instanceof`) still works if multiple copies of `@hebcal/core` are
|
|
6
|
+
* loaded. Not re-exported from the package index.
|
|
7
|
+
*/
|
|
8
|
+
export declare function isTimedEvent(ev: Event): ev is TimedEvent;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Narrows an `Event` to a `TimedEvent` by duck-typing on `eventTime`, which
|
|
3
|
+
* (unlike `instanceof`) still works if multiple copies of `@hebcal/core` are
|
|
4
|
+
* loaded. Not re-exported from the package index.
|
|
5
|
+
*/
|
|
6
|
+
export function isTimedEvent(ev) {
|
|
7
|
+
return ev.eventTime !== undefined;
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=isTimedEvent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isTimedEvent.js","sourceRoot":"","sources":["../../src/isTimedEvent.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,EAAS;IACpC,OAAQ,EAA0B,CAAC,SAAS,KAAK,SAAS,CAAC;AAC7D,CAAC"}
|
package/dist/esm/location.d.ts
CHANGED
package/dist/esm/location.js
CHANGED
|
@@ -14,6 +14,14 @@ const LOC_FIELDS = [
|
|
|
14
14
|
'stateName',
|
|
15
15
|
'geonameid',
|
|
16
16
|
];
|
|
17
|
+
function copyTruthyFields(dst, src, keys) {
|
|
18
|
+
for (const k of keys) {
|
|
19
|
+
const val = src[k];
|
|
20
|
+
if (val) {
|
|
21
|
+
dst[k] = val;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
|
17
25
|
/**
|
|
18
26
|
* Converts a `@hebcal/core` `Location` to a plain, JSON-serializable object.
|
|
19
27
|
* Some fields (e.g. `elevation`, `state`, `geonameid`) are only present when
|
|
@@ -33,15 +41,10 @@ export function locationToPlainObj(location) {
|
|
|
33
41
|
tzid: location.getTzid(),
|
|
34
42
|
latitude: location.getLatitude(),
|
|
35
43
|
longitude: location.getLongitude(),
|
|
36
|
-
cc
|
|
37
|
-
country: countryNames[cc],
|
|
44
|
+
cc,
|
|
45
|
+
country: cc === undefined ? undefined : countryNames[cc],
|
|
38
46
|
};
|
|
39
|
-
|
|
40
|
-
const val = location[k];
|
|
41
|
-
if (val) {
|
|
42
|
-
o[k] = val;
|
|
43
|
-
}
|
|
44
|
-
}
|
|
47
|
+
copyTruthyFields(o, location, LOC_FIELDS);
|
|
45
48
|
return o;
|
|
46
49
|
}
|
|
47
50
|
else {
|
package/dist/esm/location.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"location.js","sourceRoot":"","sources":["../../src/location.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,MAAM,wBAAwB,CAAC;AAEnD;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAc,aAA0B,CAAC;AAsClE,MAAM,UAAU,GAAG;IACjB,WAAW;IACX,QAAQ;IACR,WAAW;IACX,KAAK;IACL,KAAK;IACL,OAAO;IACP,WAAW;IACX,WAAW;
|
|
1
|
+
{"version":3,"file":"location.js","sourceRoot":"","sources":["../../src/location.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,MAAM,wBAAwB,CAAC;AAEnD;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAc,aAA0B,CAAC;AAsClE,MAAM,UAAU,GAAG;IACjB,WAAW;IACX,QAAQ;IACR,WAAW;IACX,KAAK;IACL,KAAK;IACL,OAAO;IACP,WAAW;IACX,WAAW;CAC2C,CAAC;AAUzD,SAAS,gBAAgB,CACvB,GAAM,EACN,GAAe,EACf,IAAkB;IAElB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,GAAG,EAAE,CAAC;YACR,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QACf,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAChC,QAA8B;IAE9B,IACE,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,KAAK,IAAI;QACjB,OAAO,QAAQ,CAAC,WAAW,KAAK,UAAU,EAC1C,CAAC;QACD,MAAM,EAAE,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;QACrC,MAAM,CAAC,GAAqB;YAC1B,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE;YACzB,IAAI,EAAE,QAAQ,CAAC,YAAY,EAAE;YAC7B,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE;YACxB,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;YAChC,SAAS,EAAE,QAAQ,CAAC,YAAY,EAAE;YAClC,EAAE;YACF,OAAO,EAAE,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC;SACzD,CAAC;QACF,gBAAgB,CAAC,CAAC,EAAE,QAAqC,EAAE,UAAU,CAAC,CAAC;QACvE,OAAO,CAAC,CAAC;IACX,CAAC;SAAM,CAAC;QACN,OAAO,EAAC,GAAG,EAAE,MAAM,EAAC,CAAC;IACvB,CAAC;AACH,CAAC"}
|
package/dist/esm/url.js
CHANGED
|
@@ -2,9 +2,8 @@ import { HDate } from '@hebcal/hdate';
|
|
|
2
2
|
import { parshiot } from '@hebcal/core/dist/esm/sedra';
|
|
3
3
|
import { makeAnchor } from './makeAnchor.js';
|
|
4
4
|
const parsha2id = new Map();
|
|
5
|
-
for (
|
|
6
|
-
|
|
7
|
-
parsha2id.set(makeAnchor(name), id + 1);
|
|
5
|
+
for (const [idx, name] of parshiot.entries()) {
|
|
6
|
+
parsha2id.set(makeAnchor(name), idx + 1);
|
|
8
7
|
}
|
|
9
8
|
const doubledParshiyot = [
|
|
10
9
|
'Vayakhel-Pekudei',
|
|
@@ -58,7 +57,6 @@ export function shortenSedrotUrl(u) {
|
|
|
58
57
|
p += 'i';
|
|
59
58
|
u.searchParams.delete('i');
|
|
60
59
|
}
|
|
61
|
-
const id = parsha2id.get(name);
|
|
62
60
|
p += '/' + id;
|
|
63
61
|
if (doubled.has(name)) {
|
|
64
62
|
p += 'd';
|
package/dist/esm/url.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/url.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,eAAe,CAAC;AACpC,OAAO,EAAC,QAAQ,EAAC,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAE3C,MAAM,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;AAC5C,KAAK,
|
|
1
|
+
{"version":3,"file":"url.js","sourceRoot":"","sources":["../../src/url.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hebcal/rest-api",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.3.0",
|
|
4
4
|
"author": "Michael J. Radwin (https://github.com/mjradwin)",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"hebcal"
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
},
|
|
30
30
|
"homepage": "https://hebcal.github.io/api/rest-api/",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@hebcal/core": "^6.
|
|
33
|
-
"@hebcal/hdate": "^0.
|
|
34
|
-
"@hebcal/leyning": "^10.0.
|
|
32
|
+
"@hebcal/core": "^6.13.0",
|
|
33
|
+
"@hebcal/hdate": "^0.23.0",
|
|
34
|
+
"@hebcal/leyning": "^10.0.2"
|
|
35
35
|
},
|
|
36
36
|
"scripts": {
|
|
37
37
|
"po2json": "node ./po2json.js po/en.po po/he.po",
|
|
@@ -42,18 +42,19 @@
|
|
|
42
42
|
"lint": "oxlint && prettier --check \"src/**/*.ts\" \"*.js\"",
|
|
43
43
|
"clean": "rm -rf ./dist",
|
|
44
44
|
"fix": "oxlint --fix && prettier --write \"src/**/*.ts\" \"*.js\"",
|
|
45
|
-
"test": "vitest",
|
|
45
|
+
"test": "vitest run",
|
|
46
|
+
"test:watch": "vitest",
|
|
46
47
|
"json2ts": "node ./json2ts.js src/countryNames.json"
|
|
47
48
|
},
|
|
48
49
|
"license": "BSD-2-Clause",
|
|
49
50
|
"devDependencies": {
|
|
50
|
-
"@hebcal/learning": "^6.
|
|
51
|
-
"@hebcal/locales": "^6.5.
|
|
52
|
-
"@types/node": "^26.
|
|
51
|
+
"@hebcal/learning": "^6.12.0",
|
|
52
|
+
"@hebcal/locales": "^6.5.3",
|
|
53
|
+
"@types/node": "^26.6.4",
|
|
53
54
|
"gettext-parser": "^9.1.1",
|
|
54
|
-
"oxlint": "^1.
|
|
55
|
-
"prettier": "^3.9.
|
|
55
|
+
"oxlint": "^1.86.0",
|
|
56
|
+
"prettier": "^3.9.9",
|
|
56
57
|
"typescript": "^7.0.2",
|
|
57
|
-
"vitest": "^
|
|
58
|
+
"vitest": "^5.0.3"
|
|
58
59
|
}
|
|
59
60
|
}
|