Skip to content
Snippets Groups Projects
Unverified Commit 0a34ede6 authored by Koen van Staveren's avatar Koen van Staveren Committed by GitHub
Browse files

fix: typescript rschedule types (#3361)

* fix: typescript rschedule types

* chore: release note
parent 8a4a9ba0
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,6 @@ function parseRecurDate(desc) { ...@@ -35,7 +35,6 @@ function parseRecurDate(desc) {
return { return {
type: 'recur', type: 'recur',
// @ts-expect-error fix me
schedule: new RSchedule({ schedule: new RSchedule({
rrules: rules, rrules: rules,
data: { data: {
......
...@@ -374,21 +374,17 @@ async function getUpcomingDates({ config, count }) { ...@@ -374,21 +374,17 @@ async function getUpcomingDates({ config, count }) {
const rules = recurConfigToRSchedule(config); const rules = recurConfigToRSchedule(config);
try { try {
// @ts-expect-error fix me
const schedule = new RSchedule({ rrules: rules }); const schedule = new RSchedule({ rrules: rules });
return ( return schedule
schedule .occurrences({ start: d.startOfDay(new Date()), take: count })
// @ts-expect-error fix me .toArray()
.occurrences({ start: d.startOfDay(new Date()), take: count }) .map(date =>
.toArray() config.skipWeekend
.map(date => ? getDateWithSkippedWeekend(date.date, config.weekendSolveMode)
config.skipWeekend : date.date,
? getDateWithSkippedWeekend(date.date, config.weekendSolveMode) )
: date.date, .map(date => dayFromDate(date));
)
.map(date => dayFromDate(date))
);
} catch (err) { } catch (err) {
captureBreadcrumb(config); captureBreadcrumb(config);
throw err; throw err;
......
...@@ -16,15 +16,11 @@ import { Schedule as RSchedule } from '../util/rschedule'; ...@@ -16,15 +16,11 @@ import { Schedule as RSchedule } from '../util/rschedule';
import { SchedulesHandlers } from './types/handlers'; import { SchedulesHandlers } from './types/handlers';
function takeDates(config) { function takeDates(config) {
// @ts-expect-error fix me
const schedule = new RSchedule({ rrules: recurConfigToRSchedule(config) }); const schedule = new RSchedule({ rrules: recurConfigToRSchedule(config) });
return ( return schedule
schedule .occurrences({ take: 3 })
// @ts-expect-error fix me .toArray()
.occurrences({ take: 3 }) .map(d => d.date);
.toArray()
.map(d => d.date)
);
} }
async function getTransactions(date, account) { async function getTransactions(date, account) {
......
import '@rschedule/standard-date-adapter/setup'; import '@rschedule/standard-date-adapter/setup';
import '@rschedule/json-tools/Schedule';
export * from '@rschedule/standard-date-adapter'; export * from '@rschedule/standard-date-adapter';
export * from '@rschedule/core'; export * from '@rschedule/core';
......
---
category: Maintenance
authors: [UnderKoen]
---
TypeScript: RSchedule types fixed
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment