Skip to content

Commit 365b8b0

Browse files
committed
Merge branch 'Map_from_nested_List' of https://github.com/ellbee/immutable-js into ellbee-Map_from_nested_List
Conflicts: dist/immutable.min.js
2 parents d842f04 + 2485750 commit 365b8b0

File tree

5 files changed

+173
-44
lines changed

5 files changed

+173
-44
lines changed

__tests__/Map.ts

+13
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,19 @@ describe('Map', () => {
4444
expect(m.get('c')).toBe('C');
4545
});
4646

47+
it('constructor provides initial values as list of lists', () => {
48+
var l = Immutable.List([
49+
Immutable.List(['a', 'A']),
50+
Immutable.List(['b', 'B']),
51+
Immutable.List(['c', 'C'])
52+
]);
53+
var m = Map(l);
54+
expect(m.size).toBe(3);
55+
expect(m.get('a')).toBe('A');
56+
expect(m.get('b')).toBe('B');
57+
expect(m.get('c')).toBe('C');
58+
});
59+
4760
it('constructor is identity when provided map', () => {
4861
var m1 = Map({'a': 'A', 'b': 'B', 'c': 'C'});
4962
var m2 = Map(m1);

dist/immutable.js

+13-3
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,12 @@
10611061
// in the parent iteration.
10621062
if (entry) {
10631063
validateEntry(entry);
1064-
return fn(entry[1], entry[0], this$0);
1064+
var indexedIterable = isIterable(entry);
1065+
return fn(
1066+
indexedIterable ? entry.get(1) : entry[1],
1067+
indexedIterable ? entry.get(0) : entry[0],
1068+
this$0
1069+
);
10651070
}
10661071
}, reverse);
10671072
};
@@ -1079,8 +1084,13 @@
10791084
// in the parent iteration.
10801085
if (entry) {
10811086
validateEntry(entry);
1082-
return type === ITERATE_ENTRIES ? step :
1083-
iteratorValue(type, entry[0], entry[1], step);
1087+
var indexedIterable = isIterable(entry);
1088+
return iteratorValue(
1089+
type,
1090+
indexedIterable ? entry.get(0) : entry[0],
1091+
indexedIterable ? entry.get(1) : entry[1],
1092+
step
1093+
);
10841094
}
10851095
}
10861096
});

0 commit comments

Comments
 (0)