wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7573 from chrootsu/lodash-merge

Browse Source 
lodash: signatures of _.merge have been changed
This commit is contained in:
Masahiro Wakame
2016-01-22 18:08:56 +09:00
parent 1365d43489 2e36df31fe
commit 39e3265446
2 changed files with 87 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lodash/lodash-tests.ts
+35
View File
@@ -8478,6 +8478,41 @@ module TestMerge {
{ a: [1] },
{ a: true }).value();
{
let result: _.LoDashExplicitObjectWrapper<ExpectedResult>;
result = _(initialValue).chain().merge(mergingValue);
result = _(initialValue).chain().merge(mergingValue, customizer);
result = _(initialValue).chain().merge(mergingValue, customizer, any);
result = _(initialValue).chain().merge({}, mergingValue);
result = _(initialValue).chain().merge({}, mergingValue, customizer);
result = _(initialValue).chain().merge({}, mergingValue, customizer, any);
result = _(initialValue).chain().merge({}, {}, mergingValue);
result = _(initialValue).chain().merge({}, {}, mergingValue, customizer);
result = _(initialValue).chain().merge({}, {}, mergingValue, customizer, any);
result = _(initialValue).chain().merge({}, {}, {}, mergingValue);
result = _(initialValue).chain().merge({}, {}, {}, mergingValue, customizer);
result = _(initialValue).chain().merge({}, {}, {}, mergingValue, customizer, any);
result = _(initialValue).chain().merge<ExpectedResult>({}, {}, {}, {}, mergingValue);
result = _(initialValue).chain().merge<ExpectedResult>({}, {}, {}, {}, mergingValue, customizer);
result = _(initialValue).chain().merge<ExpectedResult>({}, {}, {}, {}, mergingValue, customizer, any);
}
{
let result: _.LoDashExplicitObjectWrapper<ComplicatedExpectedType>;
result = _({ a: 1 }).chain().merge({ b: "string" }, { c: {} }, { d: [1] }, { e: true });
}
{
let result: _.LoDashExplicitObjectWrapper<ExpectedTypeAfterOverriding>;
result = _({ a: 1 }).chain().merge({ a: "string" }, { a: {} }, { a: [1] }, { a: true });
}
}
// _.methods
lodash/lodash.d.ts
Vendored
+52 -1
View File
@@ -13018,7 +13018,7 @@ declare module _ {
source4: TSource4,
customizer?: MergeCustomizer,
thisArg?: any
): TObject & TSource1 & TSource2 & TSource3 & TSource4;
): TObject & TSource1 & TSource2 & TSource3 & TSource4;
/**
* @see _.merge
@@ -13080,6 +13080,57 @@ declare module _ {
): LoDashImplicitObjectWrapper<TResult>;
}
interface LoDashExplicitObjectWrapper<T> {
/**
* @see _.merge
*/
merge<TSource>(
source: TSource,
customizer?: MergeCustomizer,
thisArg?: any
): LoDashExplicitObjectWrapper<T & TSource>;
/**
* @see _.merge
*/
merge<TSource1, TSource2>(
source1: TSource1,
source2: TSource2,
customizer?: MergeCustomizer,
thisArg?: any
): LoDashExplicitObjectWrapper<T & TSource1 & TSource2>;
/**
* @see _.merge
*/
merge<TSource1, TSource2, TSource3>(
source1: TSource1,
source2: TSource2,
source3: TSource3,
customizer?: MergeCustomizer,
thisArg?: any
): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3>;
/**
* @see _.merge
*/
merge<TSource1, TSource2, TSource3, TSource4>(
source1: TSource1,
source2: TSource2,
source3: TSource3,
source4: TSource4,
customizer?: MergeCustomizer,
thisArg?: any
): LoDashExplicitObjectWrapper<T & TSource1 & TSource2 & TSource3 & TSource4>;
/**
* @see _.merge
*/
merge<TResult>(
...otherArgs: any[]
): LoDashExplicitObjectWrapper<TResult>;
}
//_.methods
interface LoDashStatic {
/**