A local-first personal finance app
fix: helpers with empty or undefined values (#4356)
Koen van Staverendbdc5af2b9a2
diff --git a/packages/loot-core/src/server/accounts/rules.test.ts b/packages/loot-core/src/server/accounts/rules.test.tsindex fa2a1f8a88..6935cb7eeb 100644--- a/packages/loot-core/src/server/accounts/rules.test.ts+++ b/packages/loot-core/src/server/accounts/rules.test.ts@@ -426,18 +426,31 @@ describe('Action', () => {testHelper('{{day undefined}}', '');testHelper('{{month undefined}}', '');testHelper('{{year undefined}}', '');+ testHelper('{{day}}', '');+ testHelper('{{month}}', '');+ testHelper('{{year}}', '');testHelper('{{format undefined undefined}}', '');+ testHelper('{{format}}', '');testHelper('{{addDays "2002-07-25" 5}}', '2002-07-30');+ testHelper('{{addDays}}', '');testHelper('{{subDays "2002-07-25" 5}}', '2002-07-20');+ testHelper('{{subDays}}', '');testHelper('{{addMonths "2002-07-25" 5}}', '2002-12-25');+ testHelper('{{addMonths}}', '');testHelper('{{subMonths "2002-07-25" 5}}', '2002-02-25');+ testHelper('{{subMonths}}', '');testHelper('{{addYears "2002-07-25" 5}}', '2007-07-25');+ testHelper('{{addYears}}', '');testHelper('{{subYears "2002-07-25" 5}}', '1997-07-25');+ testHelper('{{subYears}}', '');testHelper('{{addWeeks "2002-07-25" 1}}', '2002-08-01');+ testHelper('{{addWeeks}}', '');testHelper('{{subWeeks "2002-07-25" 1}}', '2002-07-18');+ testHelper('{{subWeeks}}', '');testHelper('{{setDay "2002-07-25" 1}}', '2002-07-01');testHelper('{{setDay "2002-07-25" 32}}', '2002-08-01');testHelper('{{setDay "2002-07-25" 0}}', '2002-06-30');+ testHelper('{{setDay}}', '');});describe('other helpers', () => {diff --git a/packages/loot-core/src/server/accounts/rules.ts b/packages/loot-core/src/server/accounts/rules.tsindex d2db1f71a1..dda58bd013 100644--- a/packages/loot-core/src/server/accounts/rules.ts+++ b/packages/loot-core/src/server/accounts/rules.ts@@ -45,8 +45,6 @@ function registerHandlebarsHelpers() {function mathHelper(fn: (a: number, b: number) => number) {return (a: unknown, ...b: unknown[]) => {- // Last argument is the Handlebars options object- b.splice(-1, 1);return b.map(Number).reduce(fn, Number(a));};}@@ -111,35 +109,35 @@ function registerHandlebarsHelpers() {year: (date?: string) => date && format(date, 'yyyy'),format: (date?: string, f?: string) => date && f && format(date, f),addDays: (date?: string, days?: number) => {- if (!days || !days) return date;+ if (!date || !days) return date;return format(addDays(date, days), 'yyyy-MM-dd');},subDays: (date?: string, days?: number) => {- if (!days || !days) return date;+ if (!date || !days) return date;return format(subDays(date, days), 'yyyy-MM-dd');},addMonths: (date?: string, months?: number) => {- if (!months || !months) return date;+ if (!date || !months) return date;return format(addMonths(parseDate(date), months), 'yyyy-MM-dd');},subMonths: (date?: string, months?: number) => {- if (!months || !months) return date;+ if (!date || !months) return date;return format(subMonths(parseDate(date), months), 'yyyy-MM-dd');},addWeeks: (date?: string, weeks?: number) => {- if (!weeks || !weeks) return date;+ if (!date || !weeks) return date;return format(addWeeks(parseDate(date), weeks), 'yyyy-MM-dd');},subWeeks: (date?: string, weeks?: number) => {- if (!weeks || !weeks) return date;+ if (!date || !weeks) return date;return format(subWeeks(parseDate(date), weeks), 'yyyy-MM-dd');},addYears: (date?: string, years?: number) => {- if (!years || !years) return date;+ if (!date || !years) return date;return format(addYears(parseDate(date), years), 'yyyy-MM-dd');},subYears: (date?: string, years?: number) => {- if (!years || !years) return date;+ if (!date || !years) return date;return format(subYears(parseDate(date), years), 'yyyy-MM-dd');},setDay: (date?: string, day?: number) => {@@ -150,11 +148,14 @@ function registerHandlebarsHelpers() {debug: (value: unknown) => {console.log(value);},- concat: (...args: unknown[]) => args.slice(0, -1).join(''),- };+ concat: (...args: unknown[]) => args.join(''),+ } as Record<string, Handlebars.HelperDelegate>;for (const [name, fn] of Object.entries(helpers)) {- Handlebars.registerHelper(name, fn);+ Handlebars.registerHelper(name, (...args: unknown[]) => {+ //The last argument is the Handlebars options object+ return fn(...args.slice(0, -1));+ });}}diff --git a/upcoming-release-notes/4356.md b/upcoming-release-notes/4356.mdnew file mode 100644index 0000000000..42e67fb6ed--- /dev/null+++ b/upcoming-release-notes/4356.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [UnderKoen]+---++Rule action templating now works with helpers with no arguments