diff --git a/twix/twix.d.ts b/twix/twix.d.ts index e82df73be..4c52fbc79 100644 --- a/twix/twix.d.ts +++ b/twix/twix.d.ts @@ -9,33 +9,33 @@ declare module moment { interface Moment { twix(date: Date): Twix; twix(date: Date, allDay: boolean): Twix; - twix(date: Date, options: TwixFormatOptions): Twix; - twix(date: Date, format: string, options: TwixFormatOptions): Twix; + twix(date: Date, options: TwixParseAndFormatOptions): Twix; + twix(date: Date, format: string, options: TwixParseAndFormatOptions): Twix; twix(date: Moment): Twix; twix(date: Moment, allDay: boolean): Twix; - twix(date: Moment, options: TwixFormatOptions): Twix; - twix(date: Moment, format: string, options: TwixFormatOptions): Twix; + twix(date: Moment, options: TwixParseAndFormatOptions): Twix; + twix(date: Moment, format: string, options: TwixParseAndFormatOptions): Twix; twix(date: MomentInput): Twix; twix(date: MomentInput, allDay: boolean): Twix; - twix(date: MomentInput, options: TwixFormatOptions): Twix; - twix(date: MomentInput, format: string, options: TwixFormatOptions): Twix; + twix(date: MomentInput, options: TwixParseAndFormatOptions): Twix; + twix(date: MomentInput, format: string, options: TwixParseAndFormatOptions): Twix; twix(date: number): Twix; twix(date: number, allDay: boolean): Twix; - twix(date: number, options: TwixFormatOptions): Twix; - twix(date: number, format: string, options: TwixFormatOptions): Twix; + twix(date: number, options: TwixParseAndFormatOptions): Twix; + twix(date: number, format: string, options: TwixParseAndFormatOptions): Twix; twix(date: number[]): Twix; twix(date: number[], allDay: boolean): Twix; - twix(date: number[], options: TwixFormatOptions): Twix; - twix(date: number[], format: string, options: TwixFormatOptions): Twix; + twix(date: number[], options: TwixParseAndFormatOptions): Twix; + twix(date: number[], format: string, options: TwixParseAndFormatOptions): Twix; twix(date: string): Twix; twix(date: string, allDay: boolean): Twix; - twix(date: string, options: TwixFormatOptions): Twix; - twix(date: string, format: string, options: TwixFormatOptions): Twix; + twix(date: string, options: TwixParseAndFormatOptions): Twix; + twix(date: string, format: string, options: TwixParseAndFormatOptions): Twix; } interface MomentStatic { @@ -63,6 +63,10 @@ declare module moment { lastNightEndsAt?: number; } + interface TwixParseAndFormatOptions extends TwixFormatOptions { + parseStrict?: boolean; + } + interface TwixSimpleFormatOptions { allDay?: string; template?: (left: any, right: any) => any;