8000 Deploy 43835aa4da6dfc32188bef8918a0541efcf2f9cc to NPM branch · MULXCODE/immutable-js@dde1fbb · GitHub
[go: up one dir, main page]
Skip to content

Commit dde1fbb

Browse files
author
Travis CI
committed
Deploy 43835aa to NPM branch
1 parent c48c8e7 commit dde1fbb

File tree

3 files changed

+75
-37
lines changed

3 files changed

+75
-37
lines changed

‎dist/immutable.es.js

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1879,7 +1879,10 @@ function isPlainObj(value) {
18791879
* provided by Immutable.js or a plain Array or Object.
18801880
*/
18811881
function isDataStructure(value) {
1882-
return isImmutable(value) || Array.isArray(value) || isPlainObj(value);
1882+
return (
1883+
typeof value === 'object' &&
1884+
(isImmutable(value) || Array.isArray(value) || isPlainObj(value))
1885+
);
18831886
}
18841887

18851888
/**
@@ -4173,11 +4176,27 @@ function mixin(ctor, methods) {
41734176
}
41744177

41754178
function toJS(value) {
4176-
return isDataStructure(value)
4177-
? Seq(value)
4178-
.map(toJS)
4179-
.toJSON()
4180-
: value;
4179+
if (!value || typeof value !== 'object') {
4180+
return value;
4181+
}
4182+
if (!isCollection(value)) {
4183+
if (!isDataStructure(value)) {
4184+
return value;
4185+
}
4186+
value = Seq(value);
4187+
}
4188+
if (isKeyed(value)) {
4189+
var result$1 = {};
4190+
value.__iterate(function (v, k) {
4191+
result$1[k] = toJS(v);
4192+
});
4193+
return result$1;
4194+
}
4195+
var result = [];
4196+
value.__iterate(function (v) {
4197+
result.push(toJS(v));
4198+
});
4199+
return result;
41814200
}
41824201

41834202
var Set = (function (SetCollection$$1) {

‎dist/immutable.js

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1885,7 +1885,10 @@
18851885
* provided by Immutable.js or a plain Array or Object.
18861886
*/
18871887
function isDataStructure(value) {
1888-
return isImmutable(value) || Array.isArray(value) || isPlainObj(value);
1888+
return (
1889+
typeof value === 'object' &&
1890+
(isImmutable(value) || Array.isArray(value) || isPlainObj(value))
1891+
);
18891892
}
18901893

18911894
/**
@@ -4179,11 +4182,27 @@
41794182
}
41804183

41814184
function toJS(value) {
4182-
return isDataStructure(value)
4183-
? Seq(value)
4184-
.map(toJS)
4185-
.toJSON()
4186-
: value;
4185+
if (!value || typeof value !== 'object') {
4186+
return value;
4187+
}
4188+
if (!isCollection(value)) {
4189+
if (!isDataStructure(value)) {
4190+
return value;
4191+
}
4192+
value = Seq(value);
4193+
}
4194+
if (isKeyed(value)) {
4195+
var result$1 = {};
4196+
value.__iterate(function (v, k) {
4197+
result$1[k] = toJS(v);
4198+
});
4199+
return result$1;
4200+
}
4201+
var result = [];
4202+
value.__iterate(function (v) {
4203+
result.push(toJS(v));
4204+
});
4205+
return result;
41874206
}
41884207

41894208
var Set = (function (SetCollection$$1) {

0 commit comments

Comments
 (0)
0