A local-first personal finance app
fix: typescript rschedule types (#3361)
Koen van Staveren0a34ede61ae6
diff --git a/packages/loot-core/src/server/accounts/rules.ts b/packages/loot-core/src/server/accounts/rules.tsindex e97fa8ef2f..8bf51d7ccf 100644--- a/packages/loot-core/src/server/accounts/rules.ts+++ b/packages/loot-core/src/server/accounts/rules.ts@@ -35,7 +35,6 @@ function parseRecurDate(desc) {return {type: 'recur',- // @ts-expect-error fix meschedule: new RSchedule({rrules: rules,data: {diff --git a/packages/loot-core/src/server/schedules/app.ts b/packages/loot-core/src/server/schedules/app.tsindex dedbe2e0e8..ea99443d4b 100644--- a/packages/loot-core/src/server/schedules/app.ts+++ b/packages/loot-core/src/server/schedules/app.ts@@ -374,21 +374,17 @@ async function getUpcomingDates({ config, count }) {const rules = recurConfigToRSchedule(config);try {- // @ts-expect-error fix meconst schedule = new RSchedule({ rrules: rules });- return (- schedule- // @ts-expect-error fix me- .occurrences({ start: d.startOfDay(new Date()), take: count })- .toArray()- .map(date =>- config.skipWeekend- ? getDateWithSkippedWeekend(date.date, config.weekendSolveMode)- : date.date,- )- .map(date => dayFromDate(date))- );+ return schedule+ .occurrences({ start: d.startOfDay(new Date()), take: count })+ .toArray()+ .map(date =>+ config.skipWeekend+ ? getDateWithSkippedWeekend(date.date, config.weekendSolveMode)+ : date.date,+ )+ .map(date => dayFromDate(date));} catch (err) {captureBreadcrumb(config);throw err;diff --git a/packages/loot-core/src/server/schedules/find-schedules.ts b/packages/loot-core/src/server/schedules/find-schedules.tsindex d63c04b130..8b45406138 100644--- a/packages/loot-core/src/server/schedules/find-schedules.ts+++ b/packages/loot-core/src/server/schedules/find-schedules.ts@@ -16,15 +16,11 @@ import { Schedule as RSchedule } from '../util/rschedule';import { SchedulesHandlers } from './types/handlers';function takeDates(config) {- // @ts-expect-error fix meconst schedule = new RSchedule({ rrules: recurConfigToRSchedule(config) });- return (- schedule- // @ts-expect-error fix me- .occurrences({ take: 3 })- .toArray()- .map(d => d.date)- );+ return schedule+ .occurrences({ take: 3 })+ .toArray()+ .map(d => d.date);}async function getTransactions(date, account) {diff --git a/packages/loot-core/src/server/util/rschedule.ts b/packages/loot-core/src/server/util/rschedule.tsindex e43edb3896..0d61be8aff 100644--- a/packages/loot-core/src/server/util/rschedule.ts+++ b/packages/loot-core/src/server/util/rschedule.ts@@ -1,5 +1,4 @@import '@rschedule/standard-date-adapter/setup';-import '@rschedule/json-tools/Schedule';export * from '@rschedule/standard-date-adapter';export * from '@rschedule/core';diff --git a/upcoming-release-notes/3361.md b/upcoming-release-notes/3361.mdnew file mode 100644index 0000000000..7b9dd21635--- /dev/null+++ b/upcoming-release-notes/3361.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [UnderKoen]+---++TypeScript: RSchedule types fixed