8000 Add JS objects to Map.mergeIn & Map.mergeDeepIn flowtypes · immutable-js/immutable-js@71d7640 · GitHub
[go: up one dir, main page]
Skip to content

Commit 71d7640

Browse files
alex35milalex35mil
committed
Add JS objects to Map.mergeIn & Map.mergeDeepIn flowtypes
1 parent 68d1b90 commit 71d7640

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

‎dist/immutable.js.flow

Lines change 10000 d: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,14 @@ declare class Map<K,V> extends KeyedCollection<K,V> {
504504
updateIn(keyPath: ESIterable<any>, notSetValue: any, value: any): Map<K,V>;
505505
updateIn(keyPath: ESIterable<any>, value: any): Map<K,V>;
506506

507-
mergeIn(keyPath: ESIterable<any>, ...iterables: ESIterable<any>[]): Map<K,V>;
508-
mergeDeepIn(keyPath: ESIterable<any>, ...iterables: ESIterable<any>[]): Map<K,V>;
507+
mergeIn(
508+
keyPath: ESIterable<any>,
509+
...iterables: (ESIterable<any> | { [key: string]: any })[]
510+
): Map<K,V>;
511+
mergeDeepIn(
512+
keyPath: ESIterable<any>,
513+
...iterables: (ESIterable<any> | { [key: string]: any })[]
514+
): Map<K,V>;
509515

510516
withMutations(mutator: (mutable: this) => any): this;
511517
asMutable(): this;

‎type-definitions/immutable.js.flow

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,14 @@ declare class Map<K,V> extends KeyedCollection<K,V> {
504504
updateIn(keyPath: ESIterable<any>, notSetValue: any, value: any): Map<K,V>;
505505
updateIn(keyPath: ESIterable<any>, value: any): Map<K,V>;
506506

507-
mergeIn(keyPath: ESIterable<any>, ...iterables: ESIterable<any>[]): Map<K,V>;
508-
mergeDeepIn(keyPath: ESIterable<any>, ...iterables: ESIterable<any>[]): Map<K,V>;
507+
mergeIn(
508+
keyPath: ESIterable<any>,
509+
...iterables: (ESIterable<any> | { [key: string]: any })[]
510+
): Map<K,V>;
511+
mergeDeepIn(
512+
keyPath: ESIterable<any>,
513+
...iterables: (ESIterable<any> | { [key: string]: any })[]
514+
): Map<K,V>;
509515

510516
withMutations(mutator: (mutable: this) => any): this;
511517
asMutable(): this;

0 commit comments

Comments
 (0)
0