Merge pull request #184 from open-source-labs/staging

Staging

Author: crperezt

package-lock.json

@@ -25,8 +25,10 @@ export default (state, action) => produce(state, draft => {
 
     const objChildArray = [];
     // eslint-disable-next-line no-restricted-syntax
-    for (const objChild of obj.children) {
-      objChildArray.push(findName(index, objChild));
+    if (obj) {
+      for (const objChild of obj.children) {
+        objChildArray.push(findName(index, objChild));
+      }
     }
     // eslint-disable-next-line no-restricted-syntax
     for (const objChildName of objChildArray) {

src/app/reducers/mainReducer.js

@@ -1,6 +1,7 @@
 .json-tree {
   margin: 10px;
   padding: 0;
+  width: 900px;
   background-color: $brand-color;
   list-style: none;
 }

src/app/styles/components/_jsonTree.scss

@@ -51,7 +51,12 @@ export const throttle = (f, t) => {
 // Helper function to grab the getters/setters from `elementType`
 export const getHooksNames = elementType => {
   // Initialize empty object to store the setters and getter
-  let ast = JSXParser.parse(elementType);
+  let ast;
+  try {
+    ast = JSXParser.parse(elementType);
+  } catch(e) {
+    return ['unknown'];
+  }
   const hookState = {};
   const hooksNames = {};
 

src/backend/helpers.js

@@ -18,10 +18,18 @@ function scrubUnserializableMembers(tree: Tree): Tree {
   return tree;
 }
 
+function serializeState(state) {
+  try {
+    return JSON.parse(JSON.stringify(state));
+  } catch (e) {
+    return 'circularState';
+  };
+}
+
 /**
- * 
+ *
  * This is the current snapshot that is being sent to the snapshots array.
- * 
+ *
  */
 class Tree {
   /**
@@ -42,7 +50,7 @@ class Tree {
   parent: Tree
 
   constructor(state : string | {}, name = 'nameless', componentData: {} = {}) {
-    this.state = state === 'root' ? 'root' : JSON.parse(JSON.stringify(state));
+    this.state = state === 'root' ? 'root' : serializeState(state); // JSON.parse(JSON.stringify(state));
     this.name = name;
     this.componentData = componentData ? JSON.parse(JSON.stringify(componentData)) : {};
     this.children = [];
@@ -62,15 +70,16 @@ class Tree {
     this.parent.children.push(newSibling);
     return newSibling;
   }
+
   /**
    * @function cleanTreeCopy : Adds a sibing to the current tree
    */
   cleanTreeCopy(): Tree {
     /**
      * @object circularComponentTable : Clears circular component table only on first call, not recursive ones
-     * 
+     *
      */
-    // 
+    //
     if (copyInstances === 0) {
       copyInstances++;
       circularComponentTable.clear();

src/backend/tree.ts

@@ -0,0 +1,3 @@
+/node_modules/*
+!/node_modules/reactime
+.DS_Store