Merge pull request #407 from vans163/bugfix_map_to_object

bryanjos · web-flow · commit 1d3852f9365f · 2017-09-12T08:28:22.000-05:00
bugfix map_to_object
diff --git a/src/javascript/lib/core/functions.js b/src/javascript/lib/core/functions.js
@@ -130,15 +130,15 @@ function object_to_map(object, options = []) {
         key2 = Symbol.for(key);
       }
 
-      if (value.constructor === Object || (value instanceof Array && opt_recurse_array)) {
+      if (value !== null && (value.constructor === Object || (value instanceof Array && opt_recurse_array))) {
         value = object_to_map(value, options);
       }
       map.set(key2, value);
     });
     return map;
   } else if (object instanceof Array && opt_recurse_array) {
     return object.map((ele) => {
-      if (ele.constructor === Object || ele instanceof Array) {
+      if (ele !== null && (ele.constructor === Object || ele instanceof Array)) {
         return object_to_map(ele, options);
       }
       return ele;
diff --git a/src/javascript/tests/core/functions.spec.js b/src/javascript/tests/core/functions.spec.js
@@ -46,9 +46,9 @@ test('object_to_map/1', (t) => {
   let result = Functions.object_to_map(obj);
   t.deepEqual(result, new Map());
 
-  obj = { key: 'value' };
+  obj = { key: 'value', key2: null };
   result = Functions.object_to_map(obj);
-  t.deepEqual(result, new Map([['key', 'value']]));
+  t.deepEqual(result, new Map([['key', 'value'], ['key2', null]]));
 
   obj = {};
   obj[Symbol.for('key')] = 'value';

Original file line number	Diff line number	Diff line change
`@@ -130,15 +130,15 @@ function object_to_map(object, options = []) {`
`130`	`130`	`key2 = Symbol.for(key);`
`131`	`131`	`}`
`132`	`132`
`133`		`- if (value.constructor === Object \|\| (value instanceof Array && opt_recurse_array)) {`
	`133`	`+ if (value !== null && (value.constructor === Object \|\| (value instanceof Array && opt_recurse_array))) {`
`134`	`134`	`value = object_to_map(value, options);`
`135`	`135`	`}`
`136`	`136`	`map.set(key2, value);`
`137`	`137`	`});`
`138`	`138`	`return map;`
`139`	`139`	`} else if (object instanceof Array && opt_recurse_array) {`
`140`	`140`	`return object.map((ele) => {`
`141`		`- if (ele.constructor === Object \|\| ele instanceof Array) {`
	`141`	`+ if (ele !== null && (ele.constructor === Object \|\| ele instanceof Array)) {`
`142`	`142`	`return object_to_map(ele, options);`
`143`	`143`	`}`
`144`	`144`	`return ele;`