vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-07-01 15:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2813 from adidahiya/momentjs

Browse Source 
Update moment.js definitions to 2.8.0
This commit is contained in:
Masahiro Wakame
2014-09-16 00:15:07 +09:00
parent 91f6281fc3 1a821f7d19
commit 0ebabfdcc8
3 changed files with 139 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
moment/moment-external-tests.ts
View File

@@ -181,13 +181,13 @@ moment.isMoment();
moment.isMoment(new Date());
moment.isMoment(moment());
moment.lang('fr');
moment.localeData('fr');
moment(1316116057189).fromNow();
moment.lang('en');
moment.localeData('en');
var globalLang = moment();
var localLang = moment();
localLang.lang('fr');
localLang.localeData('fr');
localLang.format('LLLL');
globalLang.format('LLLL');
@@ -217,7 +217,7 @@ adur.subtract(1).days();
adur.subtract(1, 'd').days();
// Defining a custom language:
moment.lang('en', {
moment.localeData('en', {
months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
weekdays: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -275,14 +275,14 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
months : [
"January", "February", "March", "April", "May", "June", "July",
"August", "September", "October", "November", "December"
]
});
moment.lang('en', {
moment.localeData('en', {
months : function (momentToFormat: Moment, format: string) {
// momentToFormat is the moment currently being formatted
// format is the formatting string
@@ -294,14 +294,14 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
monthsShort : [
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
]
});
moment.lang('en', {
moment.localeData('en', {
monthsShort : function (momentToFormat: Moment, format: string) {
if (/^MMMM/.test(format)) {
return this.nominative[momentToFormat.month()];
@@ -311,39 +311,39 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
weekdays : [
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
]
});
moment.lang('en', {
moment.localeData('en', {
weekdays : function (momentToFormat: Moment) {
return this.weekdays[momentToFormat.day()];
}
});
moment.lang('en', {
moment.localeData('en', {
weekdaysShort : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
});
moment.lang('en', {
moment.localeData('en', {
weekdaysShort : function (momentToFormat: Moment) {
return this.weekdaysShort[momentToFormat.day()];
}
});
moment.lang('en', {
moment.localeData('en', {
weekdaysMin : ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"]
});
moment.lang('en', {
moment.localeData('en', {
weekdaysMin : function (momentToFormat: Moment) {
return this.weekdaysMin[momentToFormat.day()];
}
});
moment.lang('en', {
moment.localeData('en', {
longDateFormat : {
LT: "h:mm A",
L: "MM/DD/YYYY",
@@ -357,7 +357,7 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
longDateFormat : {
LT: "h:mm A",
L: "MM/DD/YYYY",
@@ -367,7 +367,7 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
relativeTime : {
future: "in %s",
past: "%s ago",
@@ -385,7 +385,7 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
meridiem : function (hour, minute, isLowercase) {
if (hour < 9) {
return "早上";
@@ -401,7 +401,7 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
calendar : {
lastDay : '[Yesterday at] LT',
sameDay : '[Today at] LT',
@@ -414,7 +414,7 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
ordinal : function (number) {
var b = number % 10;
var output = (~~ (number % 100 / 10) === 1) ? 'th' :

40
moment/moment-tests.ts
View File

@@ -186,13 +186,13 @@ moment.isMoment();
moment.isMoment(new Date());
moment.isMoment(moment());
moment.lang('fr');
moment.localeData('fr');
moment(1316116057189).fromNow();
moment.lang('en');
moment.localeData('en');
var globalLang = moment();
var localLang = moment();
localLang.lang('fr');
localLang.localeData('fr');
localLang.format('LLLL');
globalLang.format('LLLL');
@@ -222,7 +222,7 @@ adur.subtract(1).days();
adur.subtract(1, 'd').days();
// Defining a custom language:
moment.lang('en', {
moment.localeData('en', {
months: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
monthsShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
weekdays: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -280,14 +280,14 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
months : [
"January", "February", "March", "April", "May", "June", "July",
"August", "September", "October", "November", "December"
]
});
moment.lang('en', {
moment.localeData('en', {
months : function (momentToFormat: Moment, format: string) {
// momentToFormat is the moment currently being formatted
// format is the formatting string
@@ -299,14 +299,14 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
monthsShort : [
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
]
});
moment.lang('en', {
moment.localeData('en', {
monthsShort : function (momentToFormat: Moment, format: string) {
if (/^MMMM/.test(format)) {
return this.nominative[momentToFormat.month()];
@@ -316,39 +316,39 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
weekdays : [
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
]
});
moment.lang('en', {
moment.localeData('en', {
weekdays : function (momentToFormat: Moment) {
return this.weekdays[momentToFormat.day()];
}
});
moment.lang('en', {
moment.localeData('en', {
weekdaysShort : ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
});
moment.lang('en', {
moment.localeData('en', {
weekdaysShort : function (momentToFormat: Moment) {
return this.weekdaysShort[momentToFormat.day()];
}
});
moment.lang('en', {
moment.localeData('en', {
weekdaysMin : ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"]
});
moment.lang('en', {
moment.localeData('en', {
weekdaysMin : function (momentToFormat: Moment) {
return this.weekdaysMin[momentToFormat.day()];
}
});
moment.lang('en', {
moment.localeData('en', {
longDateFormat : {
LT: "h:mm A",
L: "MM/DD/YYYY",
@@ -362,7 +362,7 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
longDateFormat : {
LT: "h:mm A",
L: "MM/DD/YYYY",
@@ -372,7 +372,7 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
relativeTime : {
future: "in %s",
past: "%s ago",
@@ -390,7 +390,7 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
meridiem : function (hour, minute, isLowercase) {
if (hour < 9) {
return "早上";
@@ -406,7 +406,7 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
calendar : {
lastDay : '[Yesterday at] LT',
sameDay : '[Today at] LT',
@@ -419,7 +419,7 @@ moment.lang('en', {
}
});
moment.lang('en', {
moment.localeData('en', {
ordinal : function (number) {
var b = number % 10;
var output = (~~ (number % 100 / 10) === 1) ? 'th' :

124
moment/moment.d.ts vendored
View File

@@ -1,27 +1,35 @@
// Type definitions for Moment.js 2.5.0
// Type definitions for Moment.js 2.8.0
// Project: https://github.com/timrwood/moment
// Definitions by: Michael Lakerveld <https://github.com/Lakerfield>, Aaron King <https://github.com/kingdango>, Hiroki Horiuchi <https://github.com/horiuchi>, Dick van den Brink <https://github.com/DickvdBrink>
// Definitions by: Michael Lakerveld <https://github.com/Lakerfield>, Aaron King <https://github.com/kingdango>, Hiroki Horiuchi <https://github.com/horiuchi>, Dick van den Brink <https://github.com/DickvdBrink>, Adi Dahiya <https://github.com/adidahiya>
// Definitions: https://github.com/borisyankov/DefinitelyTyped
interface MomentInput {
years?: number;
y?: number;
months?: number;
M?: number;
weeks?: number;
w?: number;
days?: number;
d?: number;
hours?: number;
h?: number;
minutes?: number;
m?: number;
seconds?: number;
s?: number;
milliseconds?: number;
ms?: number;
}
}
interface Duration {
@@ -51,6 +59,9 @@ interface Duration {
subtract(n: number, p: string): Duration;
subtract(n: number): Duration;
subtract(d: Duration): Duration;
toISOString(): string;
}
interface Moment {
@@ -64,45 +75,81 @@ interface Moment {
endOf(unitOfTime: string): Moment;
/**
* Mutates the original moment by adding time.
*
* @param unitOfTime the key of what time you want to add (eg "years" / "hours" etc)
* Mutates the original moment by adding time. (deprecated in 2.8.0)
*
* @param unitOfTime the unit of time you want to add (eg "years" / "hours" etc)
* @param amount the amount you want to add
*/
add(unitOfTime: string, amount: number): Moment;
/**
* Mutates the original moment by adding time.
*
*
* @param amount the amount you want to add
* @param unitOfTime the key of what time you want to add (eg "years" / "hours" etc)
* @param unitOfTime the unit of time you want to add (eg "years" / "hours" etc)
*/
add(amount: number, unitOfTime: string): Moment;
/**
* Mutates the original moment by adding time.
*
* @param unitOfTime the key of what time you want to add (eg "years" / "hours" etc)
* Mutates the original moment by adding time. Note that the order of arguments can be flipped.
*
* @param amount the amount you want to add
* @param unitOfTime the unit of time you want to add (eg "years" / "hours" etc)
*/
add(unitOfTime: string, amount: string): Moment;
add(amount: string, unitOfTime: string): Moment;
/**
* Mutates the original moment by adding time.
*
* @param objectLiteral an object literal that describes multiple different keys at the same time {days:7,months:1}
*
* @param objectLiteral an object literal that describes multiple time units {days:7,months:1}
*/
add(objectLiteral: MomentInput): Moment;
/**
* Mutates the original moment by adding time.
*
*
* @param duration a length of time
*/
add(duration: Duration): Moment;
subtract(input: MomentInput): Moment;
/**
* Mutates the original moment by subtracting time. (deprecated in 2.8.0)
*
* @param unitOfTime the unit of time you want to subtract (eg "years" / "hours" etc)
* @param amount the amount you want to subtract
*/
subtract(unitOfTime: string, amount: number): Moment;
/**
* Mutates the original moment by subtracting time.
*
* @param unitOfTime the unit of time you want to subtract (eg "years" / "hours" etc)
* @param amount the amount you want to subtract
*/
subtract(amount: number, unitOfTime: string): Moment;
/**
* Mutates the original moment by subtracting time. Note that the order of arguments can be flipped.
*
* @param amount the amount you want to add
* @param unitOfTime the unit of time you want to subtract (eg "years" / "hours" etc)
*/
subtract(amount: string, unitOfTime: string): Moment;
/**
* Mutates the original moment by subtracting time.
*
* @param objectLiteral an object literal that describes multiple time units {days:7,months:1}
*/
subtract(objectLiteral: MomentInput): Moment;
/**
* Mutates the original moment by subtracting time.
*
* @param duration a length of time
*/
subtract(duration: Duration): Moment;
calendar(): string;
calendar(start: Moment): string;
clone(): Moment;
/**
* @return Unix timestamp, or milliseconds since the epoch.
*/
valueOf(): number;
local(): Moment; // current date/time in local mode
@@ -114,6 +161,7 @@ interface Moment {
year(y: number): Moment;
year(): number;
quarter(): number;
quarter(q: number): Moment;
month(M: number): Moment;
month(M: string): Moment;
month(): number;
@@ -146,6 +194,8 @@ interface Moment {
isoWeek(d: number): Moment;
isoWeeks(): number;
isoWeeks(d: number): Moment;
weeksInYear(): number;
isoWeeksInYear(): number;
from(f: Moment): string;
from(f: Moment, suffix: boolean): string;
@@ -203,27 +253,34 @@ interface Moment {
isSame(b: Date, granularity: string): boolean;
isSame(b: number[], granularity: string): boolean;
// Deprecated as of 2.8.0.
lang(language: string): Moment;
lang(reset: boolean): Moment;
lang(): MomentLanguage;
localeData(language: string): Moment;
localeData(reset: boolean): Moment;
localeData(): MomentLanguage;
// Deprecated as of 2.7.0.
max(date: Date): Moment;
max(date: number): Moment;
max(date: any[]): Moment;
max(date: string): Moment;
max(date: string, format: string): Moment;
max(clone: Moment): Moment;
// Deprecated as of 2.7.0.
min(date: Date): Moment;
min(date: number): Moment;
min(date: any[]): Moment;
min(date: string): Moment;
min(date: string, format: string): Moment;
min(clone: Moment): Moment;
get(unit: string): number;
set(unit: string, value: number): Moment;
}
interface MomentCalendar {
@@ -287,6 +344,8 @@ interface MomentRelativeTime {
interface MomentStatic {
version: string;
(): Moment;
(date: number): Moment;
(date: number[]): Moment;
@@ -311,10 +370,17 @@ interface MomentStatic {
unix(timestamp: number): Moment;
invalid(parsingFlags?: Object): Moment;
isMoment(): boolean;
isMoment(m: any): boolean;
// Deprecated in 2.8.0.
lang(language?: string): string;
lang(language?: string, definition?: MomentLanguage): string;
localeData(language?: string): string;
localeData(language?: string, definition?: MomentLanguage): string;
longDateFormat: any;
relativeTime: any;
meridiem: (hour: number, minute: number, isLowercase: boolean) => string;
@@ -326,9 +392,9 @@ interface MomentStatic {
duration(input: MomentInput): Duration;
duration(object: any): Duration;
duration(): Duration;
parseZone(date: string): Moment;
months(): string[];
months(index: number): string;
months(format: string): string[];
@@ -337,7 +403,7 @@ interface MomentStatic {
monthsShort(index: number): string;
monthsShort(format: string): string[];
monthsShort(format: string, index: number): string;
version: string;
weekdays(): string[];
weekdays(index: number): string;
weekdays(format: string): string[];
@@ -350,10 +416,18 @@ interface MomentStatic {
weekdaysMin(index: number): string;
weekdaysMin(format: string): string[];
weekdaysMin(format: string, index: number): string;
min(moments: Moment[]): Moment;
max(moments: Moment[]): Moment;
normalizeUnits(unit: string): string;
invalid(parsingFlags?: Object): Moment;
relativeTimeThreshold(threshold: string, limit: number): void;
/**
* Constant used to enable explicit ISO_8601 format parsing.
*/
ISO_8601(): void;
}
declare var moment: MomentStatic;