Skip to content

Commit 949eb8d

Browse files
committed
fix: more typescript cleaning and fixing
1 parent f9627ad commit 949eb8d

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

Diff for: types/calendarSystems/CalendarSystemBase.d.ts

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1+
import { Dayjs, OpUnitType } from 'dayjs';
2+
3+
4+
type DateLikeObject = { year: number; month: number; day: number; };
5+
type DayjsLikeObject = { $y: number; $M: number; $D: number; };
6+
17
export declare abstract class CalendarSystemBase {
28
locale: string;
39

410
constructor(locale?: string);
511

6-
abstract convertFromGregorian(date: Date | string | number | undefined | null): { year: number; month: number; day: number; } | void;
12+
abstract convertFromGregorian(date: Date | DateLikeObject | DayjsLikeObject | string | number | undefined | null): { year: number; month: number; day: number; } | void;
713
abstract convertToGregorian(year: number, month: number, day: number): { year: number; month: number; day: number; } | void;
814
abstract monthNames(locale?: string): string[];
915
getLocalizedMonthName(monthIndex: number): string;
10-
localeOverride(locale?: string): { months: string[], monthsShort: string[] };
16+
localeOverride(locale: string): Object;
17+
daysInMonth?(): number;
18+
startOf?(units: OpUnitType,isStartOf: Boolean): Dayjs;
19+
endOf?(units: OpUnitType): Dayjs;
1120
}

Diff for: types/index.d.ts

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import { PluginFunc, Dayjs, OpUnitType } from 'dayjs';
2-
3-
type DateLikeObject = { year: number; month: number; day: number; };
4-
type DayjsLikeObject = { $y: number; $M: number; $D: number; };
1+
import { PluginFunc, Dayjs } from 'dayjs';
2+
import { CalendarSystemBase } from './calendarSystems/CalendarSystemBase';
53
type CalendarSystem = 'persian' | 'gregorian' | 'islamic' | 'julian' | 'indian' | 'hebrew' | 'ethiopian' | 'coptic' | 'buddhist' | 'japanese' | 'roc' | 'nanakshahi' | 'isoWeek' | 'week' | 'quarter' | 'month' | 'year' | 'decade' | 'century' | 'millennium';
64

75
declare module 'dayjs' {
@@ -25,14 +23,5 @@ declare module 'dayjs' {
2523
const fromCalendarSystem: DayjsConstructor["fromCalendarSystem"];
2624
}
2725

28-
interface CalendarSystemBase {
29-
daysInMonth(year: number, month: number): number;
30-
startOf(year: number, month: number, day: number, units: OpUnitType): Dayjs;
31-
endOf(year: number, month: number, day: number, units: OpUnitType): Dayjs;
32-
convertToGregorian(year: number, month: number, day: number): { year: number, month: number, day: number };
33-
convertFromGregorian(date: Date | DateLikeObject | DayjsLikeObject | string | number | undefined | null): { year: number; month: number; day: number; };
34-
localeOverride(locale: string): Object;
35-
}
36-
3726
declare const calendarSystemsPlugin: PluginFunc;
3827
export = calendarSystemsPlugin;

0 commit comments

Comments
 (0)