Do not unconditionally revive received data

Author: AdamNiederer

src/devtools/components/DataField.vue

@@ -42,6 +42,7 @@ import {
   isPlainObject,
   isMap,
   isSet,
+  reviver,
   sortByKey
 } from 'src/util'
 
@@ -95,14 +96,14 @@ export default {
         isSet(value) || isMap(value)
     },
     formattedValue () {
-      const value = this.field.value
+      const value = reviver(this.field.value)
       if (value === null) {
         return 'null'
-      } else if (value === UNDEFINED || value === undefined) {
+      } else if (value === undefined) {
         return 'undefined'
-      } else if (value === NAN || Number.isNaN(value)) {
+      } else if (Number.isNaN(value)) {
         return 'NaN'
-      } else if (value === INFINITY || value === Number.POSITIVE_INFINITY) {
+      } else if (value === Number.POSITIVE_INFINITY) {
         return 'Infinity'
       } else if (Array.isArray(value)) {
         return 'Array[' + value.length + ']'

src/devtools/index.js

@@ -81,7 +81,7 @@ function initApp (shell) {
     })
 
     bridge.on('instance-details', details => {
-      store.commit('components/RECEIVE_INSTANCE_DETAILS', parse(details, true))
+      store.commit('components/RECEIVE_INSTANCE_DETAILS', parse(details))
     })
 
     bridge.on('vuex:init', snapshot => {

src/util.js

@@ -70,16 +70,16 @@ export function parse (data, revive) {
     : CircularJSON.parse(data)
 }
 
-function reviver (key, val) {
+export function reviver (key, val) {
   if (val === UNDEFINED) {
     return undefined
   } else if (val === INFINITY) {
     return Infinity
   } else if (val === NAN) {
     return NaN
-  } else if (isString(val) && val.startsWith(SET)) {
+  } else if (isSerializedSet(val)) {
     return new Set(parse(val.substring(SET.length), true))
-  } else if (isString(val) && val.startsWith(MAP)) {
+  } else if (isSerializedMap(val)) {
     return new Map(parse(val.substring(MAP.length), true))
   } else {
     return val
@@ -121,6 +121,14 @@ export function isSet (obj) {
   return obj instanceof Set
 }
 
+export function isSerializedMap (obj) {
+  return isString(obj) && obj.startsWith(MAP)
+}
+
+export function isSerializedSet (obj) {
+  return isString(obj) && obj.startsWith(SET)
+}
+
 export function isString (obj) {
   return obj instanceof String || typeof obj === 'string'
 }