Applied Type-R fixes

Author: Vlad Balin

.gitignore

@@ -6,3 +6,4 @@ node_modules
 npm-debug.log
 .DS_Store
 
+.idea

agent/Bridge.js

@@ -429,25 +429,31 @@ class Bridge {
         val = iterVal;
       }
 
-      Object.getOwnPropertyNames(val).forEach(name => {
-        if (name === '__proto__') {
+
+      // Extract inner state of the third-party frameworks data objects...
+      var source = ( val && val.__inner_state__ ) || val;
+
+      Object.getOwnPropertyNames( source ).forEach(name => {
+        if (name === '__proto__' ) {
           protod = true;
         }
         if (isFn && (name === 'arguments' || name === 'callee' || name === 'caller')) {
           return;
         }
-        result[name] = dehydrate(val[name], cleaned, [name]);
+        result[name] = dehydrate( source[name], cleaned, [name]);
       });
 
       /* eslint-disable no-proto */
       if (!protod && val.__proto__ && val.constructor.name !== 'Object') {
         var newProto = {};
         var pIsFn = typeof val.__proto__ === 'function';
         Object.getOwnPropertyNames(val.__proto__).forEach(name => {
-          if (pIsFn && (name === 'arguments' || name === 'callee' || name === 'caller')) {
+          if ( name === '__inner_state__' || ( pIsFn && (name === 'arguments' || name === 'callee' || name === 'caller') ) ) {
             return;
           }
-          newProto[name] = dehydrate(val.__proto__[name], protoclean, [name]);
+          // Calculated properties should not be evaluated on prototype.
+          var prop = Object.getOwnPropertyDescriptor( val.__proto__, name );
+          newProto[name] = dehydrate( prop.get ? prop.get : val.__proto__[name], protoclean, [name]);
         });
         proto = newProto;
       }

agent/dehydrate.js

@@ -89,7 +89,11 @@ function createDehydrated(type: string, data: Object, cleaned: Array<Array<strin
  * and cleaned = [["some", "attr"], ["other"]]
  */
 function dehydrate(data: Object, cleaned: Array<Array<string>>, path?: Array<string> = [], level?: number = 0): string | Object {
-
+  // Support third-party frameworks data objects in react component state.
+  if (data && data.__inner_state__ && path && path[path.length - 1] === 'state') {
+    data = data.__inner_state__;
+  }
+  
   var type = getPropType(data);
 
   switch (type) {

agent/getIn.js

@@ -15,15 +15,29 @@
  * @return {any}      Value at end of path or `mull`
  */
 function getIn(base, path) {
+  let isPrototypeChain = false;
+  
   return path.reduce((obj, attr) => {
     if (obj) {
-      if (obj.hasOwnProperty(attr)) {
+        // Mark the beginning of the prototype chain...
+      if (attr === '__proto__') {
+        isPrototypeChain = true;
         return obj[attr];
       }
+      
       if (typeof obj[Symbol.iterator] === 'function') {
         // Convert iterable to array and return array[index]
         return [...obj][attr];
       }
+
+      
+      if (isPrototypeChain) {
+        // Avoid calling calculated properties on prototype.
+        const property = Object.getOwnPropertyDescriptor( obj, attr );
+        return property.get || property.value;
+      }
+      
+      return ( obj.__inner_state__ || obj )[attr];      
     }
 
     return null;