From afca3eeba98f0e059e5b3a812fca3136de36dea2 Mon Sep 17 00:00:00 2001 From: DecafDev <40307803+decaf-dev@users.noreply.github.com> Date: Fri, 2 May 2025 20:47:14 -0600 Subject: [PATCH] fix: use correct types for moment.js --- src/svelte/app/services/time-string.ts | 8 +++++--- src/svelte/shared/services/time-utils.ts | 24 +++++++++++++----------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/svelte/app/services/time-string.ts b/src/svelte/app/services/time-string.ts index 8630e43..5944562 100644 --- a/src/svelte/app/services/time-string.ts +++ b/src/svelte/app/services/time-string.ts @@ -1,8 +1,10 @@ -import { moment } from "obsidian"; +import { moment as _moment } from "obsidian"; + +const moment = _moment as unknown as typeof _moment.default; export const formatAsBearTimeString = (milliseconds: number) => { - const now = (moment as any)(); - const time = (moment as any)(milliseconds); + const now = moment(); + const time = moment(milliseconds); const diffInSeconds = now.diff(time, "seconds"); const diffInMinutes = now.diff(time, "minutes"); diff --git a/src/svelte/shared/services/time-utils.ts b/src/svelte/shared/services/time-utils.ts index d2a51b3..71373c8 100644 --- a/src/svelte/shared/services/time-utils.ts +++ b/src/svelte/shared/services/time-utils.ts @@ -1,4 +1,6 @@ -import { moment } from "obsidian"; +import { moment as _moment } from "obsidian"; + +const moment = _moment as unknown as typeof _moment.default; const DATE_FORMATS = ["YYYY-MM-DDTHH:mm:ss", "YYYY-MM-DDTHH:mm", "YYYY-MM-DD"]; @@ -7,7 +9,7 @@ const DATE_FORMATS = ["YYYY-MM-DDTHH:mm:ss", "YYYY-MM-DDTHH:mm", "YYYY-MM-DD"]; * @returns - The current time in milliseconds */ export const getStartOfTodayMillis = () => { - return (moment as any)().startOf("day").valueOf(); + return moment().startOf("day").valueOf(); }; /** @@ -16,7 +18,7 @@ export const getStartOfTodayMillis = () => { * @returns - The start of the day in milliseconds */ export const getStartOfDayMillis = (date: string) => { - return (moment as any)(date).startOf("day").valueOf(); + return moment(date).startOf("day").valueOf(); }; /** @@ -24,19 +26,19 @@ export const getStartOfDayMillis = (date: string) => { * @returns - The start of the week in milliseconds */ export const getStartOfThisWeekMillis = () => { - return (moment as any)().startOf("week").valueOf(); + return moment().startOf("week").valueOf(); }; export const getMomentDate = (date: string) => { - return (moment as any)(date, DATE_FORMATS, true); + return moment(date, DATE_FORMATS, true); }; export const getDateDaysAgo = (daysAgo: number) => { - return (moment as any)().subtract(daysAgo, "days").format("YYYY-MM-DD"); + return moment().subtract(daysAgo, "days").format("YYYY-MM-DD"); }; export const getDateDaysAhead = (daysAgo: number) => { - return (moment as any)().add(daysAgo, "days").format("YYYY-MM-DD"); + return moment().add(daysAgo, "days").format("YYYY-MM-DD"); }; /** @@ -45,7 +47,7 @@ export const getDateDaysAhead = (daysAgo: number) => { */ export const getStartOfLastWeekMillis = () => { //This is the Sunday the previous week - return (moment as any)().subtract(1, "weeks").startOf("week").valueOf(); + return moment().subtract(1, "weeks").startOf("week").valueOf(); }; /** @@ -54,7 +56,7 @@ export const getStartOfLastWeekMillis = () => { * @returns - The date in milliseconds */ export const getTimeMillis = (date: string) => { - const momentDate = (moment as any)(date, DATE_FORMATS, true); + const momentDate = moment(date, DATE_FORMATS, true); if (!momentDate.isValid()) { throw new Error(`Date format not handled: ${date}`); @@ -68,7 +70,7 @@ export const getTimeMillis = (date: string) => { * @returns - True if the date is supported, false otherwise */ export const isDateSupported = (date: string) => { - const momentDate = (moment as any)(date, DATE_FORMATS, true); + const momentDate = moment(date, DATE_FORMATS, true); return momentDate.isValid(); }; @@ -78,7 +80,7 @@ export const isDateSupported = (date: string) => { * @returns - The end of the day in milliseconds */ export const getEndOfDayMillis = (date: string) => { - const day = (moment as any)(date); + const day = moment(date); day.set({ hour: 23, minute: 59,