From 1630517f61a3e642dbff7d4dd6b10e3a2f124a86 Mon Sep 17 00:00:00 2001 From: Jin <22962980+JYC333@users.noreply.github.com> Date: Tue, 1 Apr 2025 19:25:58 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20improve=20title=20partte?= =?UTF-8?q?rn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/date_notes.ts | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/services/date_notes.ts b/src/services/date_notes.ts index 657f4030c..69191e5fd 100644 --- a/src/services/date_notes.ts +++ b/src/services/date_notes.ts @@ -48,6 +48,20 @@ function ordinal(dayNumber: number) { type TimeUnit = 'year' | 'quarter' | 'month' | 'week' | 'day'; +const baseReplacements = { + year: ['year'], + quarter: ['quarterNumber'], + month: ['isoMonth', 'monthNumberPadded', 'month', 'shortMonth3', 'shortMonth4'], + week: ['weekNumber'], + day: ['isoDate', 'dayInMonthPadded', 'ordinal', 'weekDay', 'weekDay3', 'weekDay2'] +}; + +function getTimeUnitReplacements(timeUnit: TimeUnit): string[] { + const units: TimeUnit[] = ['year', 'quarter', 'month', 'week', 'day']; + const index = units.indexOf(timeUnit); + return units.slice(0, index + 1).flatMap(unit => baseReplacements[unit]); +} + function getJournalNoteTitle(rootNote: BNote, timeUnit: TimeUnit, dateObj: Dayjs, number?: number) { const patterns = { year: rootNote.getOwnedLabelValue("yearPattern") || "{year}", @@ -61,7 +75,7 @@ function getJournalNoteTitle(rootNote: BNote, timeUnit: TimeUnit, dateObj: Dayjs const monthName = t(MONTH_TRANSLATION_IDS[dateObj.month()]); const weekDay = t(WEEKDAY_TRANSLATION_IDS[dateObj.day()]); - const replacements: Record = { + const allReplacements: Record = { // Common date formats '{year}': dateObj.format('YYYY'), '{isoDate}': dateObj.format('YYYY-MM-DD'), @@ -87,7 +101,15 @@ function getJournalNoteTitle(rootNote: BNote, timeUnit: TimeUnit, dateObj: Dayjs '{weekDay2}': weekDay.substring(0, 2) }; - return Object.entries(replacements).reduce( + const allowedReplacements = Object.entries(allReplacements).reduce((acc, [key, value]) => { + const replacementKey = key.slice(1, -1); + if (getTimeUnitReplacements(timeUnit).includes(replacementKey)) { + acc[key] = value; + } + return acc; + }, {} as Record); + + return Object.entries(allowedReplacements).reduce( (title, [key, value]) => title.replace(new RegExp(key, 'g'), value), pattern );