diff --git a/moment/moment-tests.ts b/moment/moment-tests.ts index 5d77aa3d3..684c91e3f 100644 --- a/moment/moment-tests.ts +++ b/moment/moment-tests.ts @@ -70,12 +70,22 @@ moment().minutes(30); moment().hours(12); moment().date(5); moment().day(5); +moment().day("Sunday"); moment().month(5); +moment().month("January"); moment().year(1984); moment().startOf('year'); moment().month(0).date(1).hours(0).minutes(0).seconds(0).milliseconds(0); moment().startOf('hour'); moment().minutes(0).seconds(0).milliseconds(0); +moment().weekday(); +moment().weekday(0); +moment().isoWeekday(1); +moment().isoWeekday(); +moment().weekYear(2); +moment().weekYear(); +moment().isoWeekYear(3); +moment().isoWeekYear(); var getMilliseconds: number = moment().milliseconds(); var getSeconds: number = moment().seconds(); @@ -86,9 +96,7 @@ var getDay: number = moment().day(); var getMonth: number = moment().month(); var getYear: number = moment().year(); -moment().sod(); moment().hours(0).minutes(0).seconds(0).milliseconds(0); -moment().eod(); var a3 = moment([2011, 0, 1, 8]); a3.hours(); @@ -134,6 +142,7 @@ a8.diff(b8, 'years') a8.diff(b8, 'years', true); moment([2007, 0, 29]).toDate(); +moment([2007, 1, 23]).toISOString(); moment(1318874398806).valueOf(); moment(1318874398806).unix(); moment([2000]).isLeapYear(); diff --git a/moment/moment.d.ts b/moment/moment.d.ts index 900c686fa..e937f53df 100644 --- a/moment/moment.d.ts +++ b/moment/moment.d.ts @@ -1,4 +1,4 @@ -// Type definitions for Moment.js 2.0.0 +// Type definitions for Moment.js 2.1.0 // Project: https://github.com/timrwood/moment // Definitions by: Michael Lakerveld // DefinitelyTyped: https://github.com/borisyankov/DefinitelyTyped @@ -80,8 +80,10 @@ interface Moment { year(y: number): Moment; year(): number; month(M: number): Moment; + month(M: string): Moment; month(): number; day(d: number): Moment; + day(d: string): Moment; day(): number; date(d: number): Moment; date(): number; @@ -93,9 +95,14 @@ interface Moment { seconds(): number; milliseconds(ms: number): Moment; milliseconds(): number; - - sod(): Moment; // Start of Day - eod(): Moment; // End of Day + weekday(): Moment; + weekday(d: number): Moment; + isoWeekday(): Moment; + isoWeekday(d: number): Moment; + weekYear(): Moment; + weekYear(d: number): Moment; + isoWeekYear(): Moment; + isoWeekYear(d: number): Moment; from(f: Moment): string; from(f: Moment, suffix: boolean): string; @@ -108,6 +115,7 @@ interface Moment { diff(b: Moment, soort: string, round: boolean): number; toDate(): Date; + toISOString(): string; unix(): number; isLeapYear(): boolean;