@hebcal/leyning 10.0.0 → 10.0.1
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/clone.js.map +1 -1
- package/dist/esm/csv.js +5 -8
- package/dist/esm/csv.js.map +1 -1
- package/dist/esm/getLeyningForHoliday.js +4 -5
- package/dist/esm/getLeyningForHoliday.js.map +1 -1
- package/dist/esm/getLeyningKeyForEvent.d.ts +4 -4
- package/dist/esm/getLeyningKeyForEvent.js +16 -17
- package/dist/esm/getLeyningKeyForEvent.js.map +1 -1
- package/dist/esm/getLeyningOnDate.js +1 -2
- package/dist/esm/getLeyningOnDate.js.map +1 -1
- package/dist/esm/leyning.js +2 -3
- package/dist/esm/leyning.js.map +1 -1
- package/dist/esm/specialReadings.js +1 -2
- package/dist/esm/specialReadings.js.map +1 -1
- package/package.json +10 -9
package/dist/esm/clone.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/clone.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,kBAAkB,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../src/clone.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,kBAAkB,EAAC,MAAM,aAAa,CAAC;AAM/C;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,IAAc;IACzC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,CAAsB,CAAC;IACxD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;SAAM,CAAC;QACN,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,SAAS,CAAC,MAAgB;IACxC,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAC1B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC,CAAE,EAAE,CAAC,CAAC;QAChD,CAAC,CAAC,MAAM,CAAC,CAAE,CAAC;AAChB,CAAC"}
|
package/dist/esm/csv.js
CHANGED
|
@@ -22,7 +22,7 @@ function fmtDate(dt) {
|
|
|
22
22
|
* @returns a map whose keys are the parsha dates, each set to `true`
|
|
23
23
|
*/
|
|
24
24
|
export function getParshaDates(events) {
|
|
25
|
-
const parshaEvents = events.filter(ev => ev.
|
|
25
|
+
const parshaEvents = events.filter(ev => ev.hasFlag('PARSHA_HASHAVUA'));
|
|
26
26
|
const emptyMap = {};
|
|
27
27
|
const parshaDates = parshaEvents.reduce((set, ev) => {
|
|
28
28
|
set[ev.getDate().toString()] = true;
|
|
@@ -37,7 +37,6 @@ function getParshaAndHolidayEvents(year, il) {
|
|
|
37
37
|
events.sort((a, b) => a.getDate().abs() - b.getDate().abs());
|
|
38
38
|
return events;
|
|
39
39
|
}
|
|
40
|
-
const PARSHA_HASHAVUA = flags.PARSHA_HASHAVUA;
|
|
41
40
|
/**
|
|
42
41
|
* Writes a full-year Full Kriyah CSV (all parshiyot and holidays) to a
|
|
43
42
|
* stream, including the header row.
|
|
@@ -51,18 +50,17 @@ export function writeFullKriyahCsv(stream, hyear, il) {
|
|
|
51
50
|
const parshaDates = getParshaDates(events);
|
|
52
51
|
stream.write('"Date","Parashah","Aliyah","Reading","Verses"\r\n');
|
|
53
52
|
for (const ev of events) {
|
|
54
|
-
if (ev.
|
|
53
|
+
if (ev.hasFlag('PARSHA_HASHAVUA') ||
|
|
55
54
|
!parshaDates[ev.getDate().toString()]) {
|
|
56
55
|
writeFullKriyahEvent(stream, ev, il);
|
|
57
56
|
}
|
|
58
57
|
}
|
|
59
58
|
}
|
|
60
59
|
function ignore(ev) {
|
|
61
|
-
|
|
62
|
-
if (mask === flags.SPECIAL_SHABBAT) {
|
|
60
|
+
if (ev.hasFlag('SPECIAL_SHABBAT')) {
|
|
63
61
|
return true;
|
|
64
62
|
}
|
|
65
|
-
if (
|
|
63
|
+
if (!ev.hasFlag('ROSH_CHODESH')) {
|
|
66
64
|
return false;
|
|
67
65
|
}
|
|
68
66
|
return ev.getDate().getDay() === 6;
|
|
@@ -78,8 +76,7 @@ export function writeFullKriyahEvent(stream, ev, il) {
|
|
|
78
76
|
if (ignore(ev)) {
|
|
79
77
|
return;
|
|
80
78
|
}
|
|
81
|
-
const
|
|
82
|
-
const isParsha = mask === PARSHA_HASHAVUA;
|
|
79
|
+
const isParsha = ev.hasFlag('PARSHA_HASHAVUA');
|
|
83
80
|
const reading = isParsha
|
|
84
81
|
? getLeyningForParshaHaShavua(ev, il)
|
|
85
82
|
: getLeyningForHoliday(ev, il);
|
package/dist/esm/csv.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csv.js","sourceRoot":"","sources":["../../src/csv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAC,KAAK,EAAE,KAAK,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAC,YAAY,EAAC,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAC,uBAAuB,EAAC,MAAM,gCAAgC,CAAC;AAEvE,OAAO,EAAC,oBAAoB,EAAC,MAAM,aAAa,CAAC;AACjD,OAAO,EACL,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAC,qBAAqB,EAAC,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAC,2BAA2B,EAAC,MAAM,cAAc,CAAC;AAGzD,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;IAC3C,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,SAAS;CACf,CAAC,CAAC;AAEH,SAAS,OAAO,CAAC,EAAQ;IACvB,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACpC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC;AAMD;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,MAAe;IAC5C,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"csv.js","sourceRoot":"","sources":["../../src/csv.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { flags } from '@hebcal/core/dist/esm/event';
|
|
2
1
|
import { Locale } from './locale.js';
|
|
3
2
|
import { calculateNumVerses, NUM_VERSES } from './common.js';
|
|
4
3
|
import { translateLeyning } from './translate.js';
|
|
5
4
|
import { makeLeyningParts, makeSummaryFromParts } from './summary.js';
|
|
6
5
|
import { cloneHaftara, sumVerses } from './clone.js';
|
|
7
6
|
import { lookupFestival } from './festival.js';
|
|
8
|
-
import {
|
|
7
|
+
import { HOLIDAY_IGNORE_FLAGS, getLeyningKeyForEvent, isModernHolidayWithReading, } from './getLeyningKeyForEvent.js';
|
|
9
8
|
/**
|
|
10
9
|
* Looks up the leyning for a holiday by its (untranslated) reading key —
|
|
11
10
|
* one of the keys in `holiday-readings.json`.
|
|
@@ -118,7 +117,7 @@ export function getLeyningForHolidayKey(key, cholHaMoedDay, il, language = 'en')
|
|
|
118
117
|
* @throws {TypeError} if `ev` is not a valid event or is a parsha event
|
|
119
118
|
*/
|
|
120
119
|
export function getLeyningForHoliday(ev, il = false, language = 'en') {
|
|
121
|
-
if (typeof ev !== 'object' || typeof ev.
|
|
120
|
+
if (typeof ev !== 'object' || typeof ev.hasFlag !== 'function') {
|
|
122
121
|
throw new TypeError(`Bad event argument: ${JSON.stringify(ev)}`);
|
|
123
122
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
124
123
|
}
|
|
@@ -126,10 +125,10 @@ export function getLeyningForHoliday(ev, il = false, language = 'en') {
|
|
|
126
125
|
// Events with eventTime are not supported for leyning lookup
|
|
127
126
|
return undefined;
|
|
128
127
|
}
|
|
129
|
-
else if (ev.
|
|
128
|
+
else if (ev.hasFlag('PARSHA_HASHAVUA')) {
|
|
130
129
|
throw new TypeError(`Event should be a holiday: ${ev.getDesc()}`);
|
|
131
130
|
}
|
|
132
|
-
else if (ev.
|
|
131
|
+
else if (ev.hasAnyFlag(...HOLIDAY_IGNORE_FLAGS) &&
|
|
133
132
|
!isModernHolidayWithReading(ev)) {
|
|
134
133
|
return undefined;
|
|
135
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLeyningForHoliday.js","sourceRoot":"","sources":["../../src/getLeyningForHoliday.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getLeyningForHoliday.js","sourceRoot":"","sources":["../../src/getLeyningForHoliday.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { Event } from '@hebcal/core/dist/esm/event';
|
|
1
|
+
import { Event, FlagName } from '@hebcal/core/dist/esm/event';
|
|
2
2
|
/**
|
|
3
|
-
*
|
|
3
|
+
* Event flags that never have their own Torah reading (Daf Yomi,
|
|
4
4
|
* Omer count, molad, Shabbat Mevarchim, etc.), used to skip such events when
|
|
5
|
-
* finding a leyning key.
|
|
5
|
+
* finding a leyning key. `MODERN_HOLIDAY` is included here, but a
|
|
6
6
|
* few modern holidays do have readings — see {@link isModernHolidayWithReading}.
|
|
7
7
|
* @readonly
|
|
8
8
|
*/
|
|
9
|
-
export declare const
|
|
9
|
+
export declare const HOLIDAY_IGNORE_FLAGS: FlagName[];
|
|
10
10
|
/**
|
|
11
11
|
* Most modern holidays have no Torah reading, but a few (such as
|
|
12
12
|
* Yom HaAtzma'ut) do have an entry in `holiday-readings.json`
|
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
import { HDate, months } from '@hebcal/hdate';
|
|
2
|
-
import { flags } from '@hebcal/core/dist/esm/event';
|
|
3
2
|
import { hasFestival } from './festival.js';
|
|
4
3
|
/**
|
|
5
|
-
*
|
|
4
|
+
* Event flags that never have their own Torah reading (Daf Yomi,
|
|
6
5
|
* Omer count, molad, Shabbat Mevarchim, etc.), used to skip such events when
|
|
7
|
-
* finding a leyning key.
|
|
6
|
+
* finding a leyning key. `MODERN_HOLIDAY` is included here, but a
|
|
8
7
|
* few modern holidays do have readings — see {@link isModernHolidayWithReading}.
|
|
9
8
|
* @readonly
|
|
10
9
|
*/
|
|
11
|
-
export const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
10
|
+
export const HOLIDAY_IGNORE_FLAGS = [
|
|
11
|
+
'DAF_YOMI',
|
|
12
|
+
'OMER_COUNT',
|
|
13
|
+
'SHABBAT_MEVARCHIM',
|
|
14
|
+
'MOLAD',
|
|
15
|
+
'USER_EVENT',
|
|
16
|
+
'HEBREW_DATE',
|
|
17
|
+
'MISHNA_YOMI',
|
|
18
|
+
'MODERN_HOLIDAY',
|
|
19
|
+
'YERUSHALMI_YOMI',
|
|
20
|
+
];
|
|
20
21
|
/**
|
|
21
22
|
* Most modern holidays have no Torah reading, but a few (such as
|
|
22
23
|
* Yom HaAtzma'ut) do have an entry in `holiday-readings.json`
|
|
@@ -24,8 +25,7 @@ export const HOLIDAY_IGNORE_MASK = flags.DAF_YOMI |
|
|
|
24
25
|
* @returns true if this is a modern holiday that has a reading
|
|
25
26
|
*/
|
|
26
27
|
export function isModernHolidayWithReading(ev) {
|
|
27
|
-
|
|
28
|
-
return Boolean(mask & flags.MODERN_HOLIDAY) && hasFestival(ev.getDesc());
|
|
28
|
+
return ev.hasFlag('MODERN_HOLIDAY') && hasFestival(ev.getDesc());
|
|
29
29
|
}
|
|
30
30
|
/**
|
|
31
31
|
* From an event's date, type and title, derives the key used to look up its
|
|
@@ -41,13 +41,12 @@ export function getLeyningKeyForEvent(ev, il = false) {
|
|
|
41
41
|
if (ev.eventTime !== undefined) {
|
|
42
42
|
return undefined;
|
|
43
43
|
}
|
|
44
|
-
|
|
45
|
-
if (mask & HOLIDAY_IGNORE_MASK) {
|
|
44
|
+
if (ev.hasAnyFlag(...HOLIDAY_IGNORE_FLAGS)) {
|
|
46
45
|
return isModernHolidayWithReading(ev) ? ev.getDesc() : undefined;
|
|
47
46
|
}
|
|
48
47
|
// Skip all Erevs except for Simchat Torah
|
|
49
48
|
const desc = ev.getDesc();
|
|
50
|
-
if (
|
|
49
|
+
if (ev.hasFlag('EREV') && !hasFestival(desc)) {
|
|
51
50
|
return undefined;
|
|
52
51
|
}
|
|
53
52
|
const hd = ev.getDate();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLeyningKeyForEvent.js","sourceRoot":"","sources":["../../src/getLeyningKeyForEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"getLeyningKeyForEvent.js","sourceRoot":"","sources":["../../src/getLeyningKeyForEvent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { HDate, months } from '@hebcal/hdate';
|
|
2
|
-
import { flags } from '@hebcal/core/dist/esm/event';
|
|
3
2
|
import { getLeyningForHoliday, getLeyningForHolidayKey, } from './getLeyningForHoliday.js';
|
|
4
3
|
import { getLeyningKeyForEvent } from './getLeyningKeyForEvent.js';
|
|
5
4
|
import { getLeyningForParshaHaShavua, getWeekdayReading, makeLeyningNames, } from './leyning.js';
|
|
@@ -68,7 +67,7 @@ export function getLeyningOnDate(hdate, il, wantarray = false, language = 'en')
|
|
|
68
67
|
const events = getHolidaysOnDate(hdate, il) || [];
|
|
69
68
|
let hasFullKriyah = false;
|
|
70
69
|
for (const ev of events) {
|
|
71
|
-
const specialShabbat =
|
|
70
|
+
const specialShabbat = ev.hasAnyFlag('SPECIAL_SHABBAT', 'ROSH_CHODESH');
|
|
72
71
|
if (hasParshaHaShavua && specialShabbat) {
|
|
73
72
|
continue;
|
|
74
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getLeyningOnDate.js","sourceRoot":"","sources":["../../src/getLeyningOnDate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,MAAM,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"getLeyningOnDate.js","sourceRoot":"","sources":["../../src/getLeyningOnDate.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/leyning.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { flags } from '@hebcal/core/dist/esm/event';
|
|
2
1
|
import { Locale } from './locale.js';
|
|
3
2
|
import parshiyotObj0 from './aliyot.json.js';
|
|
4
3
|
import { BOOK, calculateNumVerses, parshaToString } from './common.js';
|
|
@@ -180,10 +179,10 @@ function getHaftarahTheme(parsha, haftReason) {
|
|
|
180
179
|
* @throws {TypeError} if `ev` is not a parsha hashavua event
|
|
181
180
|
*/
|
|
182
181
|
export function getLeyningForParshaHaShavua(ev, il = false, language = 'en') {
|
|
183
|
-
if (typeof ev !== 'object' || typeof ev.
|
|
182
|
+
if (typeof ev !== 'object' || typeof ev.hasFlag !== 'function') {
|
|
184
183
|
throw new TypeError(`Bad event argument: ${ev}`);
|
|
185
184
|
}
|
|
186
|
-
else if (ev.
|
|
185
|
+
else if (!ev.hasFlag('PARSHA_HASHAVUA')) {
|
|
187
186
|
throw new TypeError(`Event must be parsha hashavua: ${ev.getDesc()}`);
|
|
188
187
|
}
|
|
189
188
|
// first, collect the default aliyot and haftara
|
package/dist/esm/leyning.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"leyning.js","sourceRoot":"","sources":["../../src/leyning.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"leyning.js","sourceRoot":"","sources":["../../src/leyning.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { months } from '@hebcal/hdate';
|
|
2
|
-
import { flags } from '@hebcal/core/dist/esm/event';
|
|
3
2
|
import { cloneHaftara } from './clone.js';
|
|
4
3
|
import { calculateNumVerses, parshaToString } from './common.js';
|
|
5
4
|
import { lookupFestival } from './festival.js';
|
|
@@ -87,7 +86,7 @@ export function specialReadings2(parsha, hd, il, aliyot) {
|
|
|
87
86
|
}
|
|
88
87
|
const parshaName = parshaToString(parsha);
|
|
89
88
|
const events0 = getHolidaysOnDate(hd, il) || [];
|
|
90
|
-
const events = events0.filter(ev => !
|
|
89
|
+
const events = events0.filter(ev => !ev.hasFlag('ROSH_CHODESH'));
|
|
91
90
|
for (const ev of events) {
|
|
92
91
|
if (ev.getDesc() === 'Shabbat Shuva') {
|
|
93
92
|
handleSpecial(`Shabbat Shuva (with ${parshaName})`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"specialReadings.js","sourceRoot":"","sources":["../../src/specialReadings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"specialReadings.js","sourceRoot":"","sources":["../../src/specialReadings.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hebcal/leyning",
|
|
3
|
-
"version": "10.0.
|
|
3
|
+
"version": "10.0.1",
|
|
4
4
|
"author": "Michael J. Radwin (https://github.com/mjradwin)",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"hebcal",
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
"node": ">=18"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@hebcal/core": "^6.
|
|
43
|
-
"@hebcal/hdate": "^0.22.
|
|
42
|
+
"@hebcal/core": "^6.10.0",
|
|
43
|
+
"@hebcal/hdate": "^0.22.8"
|
|
44
44
|
},
|
|
45
45
|
"scripts": {
|
|
46
46
|
"po2json": "node ./po2json.js po/he.po po/he-x-NoNikud.po po/ashkenazi.po",
|
|
@@ -50,7 +50,8 @@
|
|
|
50
50
|
"docs": "npx -y typedoc",
|
|
51
51
|
"pretest": "npm run build",
|
|
52
52
|
"lint": "oxlint .",
|
|
53
|
-
"test": "vitest",
|
|
53
|
+
"test": "vitest run",
|
|
54
|
+
"test:watch": "vitest",
|
|
54
55
|
"coverage": "vitest run --coverage",
|
|
55
56
|
"clean": "rm -rf dist coverage",
|
|
56
57
|
"fix": "oxlint . --fix && npm run format:fix",
|
|
@@ -59,12 +60,12 @@
|
|
|
59
60
|
},
|
|
60
61
|
"license": "BSD-2-Clause",
|
|
61
62
|
"devDependencies": {
|
|
62
|
-
"@types/node": "^26.
|
|
63
|
-
"@vitest/coverage-v8": "^
|
|
63
|
+
"@types/node": "^26.6.3",
|
|
64
|
+
"@vitest/coverage-v8": "^5.0.2",
|
|
64
65
|
"gettext-parser": "^9.1.1",
|
|
65
|
-
"oxlint": "^1.
|
|
66
|
-
"prettier": "^3.9.
|
|
66
|
+
"oxlint": "^1.86.0",
|
|
67
|
+
"prettier": "^3.9.9",
|
|
67
68
|
"typescript": "^7.0.2",
|
|
68
|
-
"vitest": "^
|
|
69
|
+
"vitest": "^5.0.2"
|
|
69
70
|
}
|
|
70
71
|
}
|