Cleanup

Daniel Brain · Daniel Brain · commit 8baf3fb03889 · 2017-08-31T13:53:52.000-07:00
diff --git a/src/lib/serialize.js b/src/lib/serialize.js
@@ -159,16 +159,19 @@ export function deserializePromise(source : any, origin : string, prom : Object)
 export function deserializeMethods(source : any, origin : string, obj : Object) : Object {
 
     return replaceObject({ obj }, (item, key) => {
+        if (typeof item !== 'object' || item === null) {
+            return;
+        }
 
-        if (typeof item === 'object' && item !== null && isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.METHOD)) {
+        if (isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.METHOD)) {
             return deserializeMethod(source, origin, item);
         }
 
-        if (typeof item === 'object' && item !== null && isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.ERROR)) {
+        if (isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.ERROR)) {
             return deserializeError(source, origin, item);
         }
 
-        if (typeof item === 'object' && item !== null && isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.PROMISE)) {
+        if (isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.PROMISE)) {
             return deserializePromise(source, origin, item);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -159,16 +159,19 @@ export function deserializePromise(source : any, origin : string, prom : Object)`
`159`	`159`	`export function deserializeMethods(source : any, origin : string, obj : Object) : Object {`
`160`	`160`
`161`	`161`	`return replaceObject({ obj }, (item, key) => {`
	`162`	`+ if (typeof item !== 'object' \|\| item === null) {`
	`163`	`+ return;`
	`164`	`+ }`
`162`	`165`
`163`		`- if (typeof item === 'object' && item !== null && isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.METHOD)) {`
	`166`	`+ if (isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.METHOD)) {`
`164`	`167`	`return deserializeMethod(source, origin, item);`
`165`	`168`	`}`
`166`	`169`
`167`		`- if (typeof item === 'object' && item !== null && isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.ERROR)) {`
	`170`	`+ if (isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.ERROR)) {`
`168`	`171`	`return deserializeError(source, origin, item);`
`169`	`172`	`}`
`170`	`173`
`171`		`- if (typeof item === 'object' && item !== null && isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.PROMISE)) {`
	`174`	`+ if (isSerialized(item, CONSTANTS.SERIALIZATION_TYPES.PROMISE)) {`
`172`	`175`	`return deserializePromise(source, origin, item);`
`173`	`176`	`}`
`174`	`177`