Merge pull request #7747 from jedmao/lodash-attempt

Additional args in lodash.attempt
This commit is contained in:
Masahiro Wakame
2016-01-25 12:20:39 +09:00
4 changed files with 12 additions and 6 deletions
+3 -3
View File
@@ -14191,21 +14191,21 @@ declare module _ {
* @param func The function to attempt.
* @return Returns the func result or error object.
*/
attempt<TResult>(func: (...args: any[]) => TResult): TResult|Error;
attempt<TResult>(func: (...args: any[]) => TResult, ...args: any[]): TResult|Error;
}
interface LoDashImplicitObjectWrapper<T> {
/**
* @see _.attempt
*/
attempt<TResult>(): TResult|Error;
attempt<TResult>(...args: any[]): TResult|Error;
}
interface LoDashExplicitObjectWrapper<T> {
/**
* @see _.attempt
*/
attempt<TResult>(): LoDashExplicitObjectWrapper<TResult|Error>;
attempt<TResult>(...args: any[]): LoDashExplicitObjectWrapper<TResult|Error>;
}
//_.callback
+3
View File
@@ -9253,13 +9253,16 @@ module TestAttempt {
let result: {a: string}|Error;
result = _.attempt<{a: string}>(func);
result = _.attempt<{a: string}>(func, 'foo', 'bar', 'baz');
result = _(func).attempt<{a: string}>();
result = _(func).attempt<{a: string}>('foo', 'bar', 'baz');
}
{
let result: _.LoDashExplicitObjectWrapper<{a: string}|Error>;
result = _(func).chain().attempt<{a: string}>();
result = _(func).chain().attempt<{a: string}>('foo', 'bar', 'baz');
}
}
+3
View File
@@ -9410,13 +9410,16 @@ module TestAttempt {
let result: {a: string}|Error;
result = _.attempt<{a: string}>(func);
result = _.attempt<{a: string}>(func, 'foo', 'bar', 'baz');
result = _(func).attempt<{a: string}>();
result = _(func).attempt<{a: string}>('foo', 'bar', 'baz');
}
{
let result: _.LoDashExplicitObjectWrapper<{a: string}|Error>;
result = _(func).chain().attempt<{a: string}>();
result = _(func).chain().attempt<{a: string}>('foo', 'bar', 'baz');
}
}
+3 -3
View File
@@ -15676,21 +15676,21 @@ declare module _ {
* @param func The function to attempt.
* @return Returns the func result or error object.
*/
attempt<TResult>(func: (...args: any[]) => TResult): TResult|Error;
attempt<TResult>(func: (...args: any[]) => TResult, ...args: any[]): TResult|Error;
}
interface LoDashImplicitObjectWrapper<T> {
/**
* @see _.attempt
*/
attempt<TResult>(): TResult|Error;
attempt<TResult>(...args: any[]): TResult|Error;
}
interface LoDashExplicitObjectWrapper<T> {
/**
* @see _.attempt
*/
attempt<TResult>(): LoDashExplicitObjectWrapper<TResult|Error>;
attempt<TResult>(...args: any[]): LoDashExplicitObjectWrapper<TResult|Error>;
}
//_.constant