Merge pull request #49 from oslabs-beta/staging

Staging

Author: crperezt

dev-reactime/astParser.js

@@ -8,10 +8,7 @@ const JSXParser = acorn.Parser.extend(jsx());
 // Helper function to grab the getters/setters from `elementType`
 module.exports = elementType => {
   // Initialize empty object to store the setters and getter
-  console.log('entered ast parser');
-  //console.log('elementType: ', elementType);
   let ast = JSXParser.parse(elementType);
-  //console.log('ast:', ast);
   const hookState = {};
 
   while (Object.hasOwnProperty.call(ast, 'body')) {

dev-reactime/index.d.ts

@@ -10,21 +10,27 @@
  * @returns {void} --> no return value
  * 
  * Reactime contributors:
- * Abaas Khorrami
- * Andy Wond
- * Bryan Lee
- * Chris Flannery
- * David Chai
- * Ergi Shehu
- * Joshua Howard
- * Josh Kim
- * Prasanna Malla
- * Rajeeb Banstola
- * Rocky Lin
- * Ruth Anam
- * Ryan Dang
- * Sierra Swaby
- * Yujin Kang
+    "Abaas Khorrami",
+    "Andy Wong",
+    "Bryan Lee",
+    "Carlos Perez",
+    "Chris Flannery",
+    "David Chai",
+    "Edwin Menendez",
+    "Ergi Shehu",
+    "Gabriela Jardim Aquino",
+    "Gregory Panciera",
+    "Josh Kim",
+    "Joshua Howard",
+    "Nathanael Wa Mwenze",
+    "Prasanna Malla",
+    "Rajeeb Banstola",
+    "Raymond Kwan",
+    "Rocky Lin",
+    "Ruth Anam",
+    "Ryan Dang",
+    "Sierra Swaby",
+    "Yujin Kang"
  * 
  * 
  * NOTE: TypeScript support is in beta and still experimental.  

dev-reactime/index.js

@@ -20,7 +20,6 @@ const mode = {
 };
 
 // const linkFiber = require('./linkFiber')(snapShot, mode);
-// console.log('import timeJump in index.js:', JSON.parse(JSON.stringify(snapShot)));
 // const timeJump = require('./timeJump')(snapShot, mode);
 
 
@@ -45,7 +44,6 @@ function getRouteURL(node) {
 window.addEventListener('message', ({ data: { action, payload } }) => {
   switch (action) {
     case 'jumpToSnap':
-      // console.log('payload in jumpToSnap', payload);
       timeJump(payload); // * This sets state with given payload
       // Get the pathname from payload and add new entry to browser history
       // MORE: https://developer.mozilla.org/en-US/docs/Web/API/History/pushState
@@ -64,7 +62,6 @@ window.addEventListener('message', ({ data: { action, payload } }) => {
   }
 });
 
-console.log('index.js: loading reactime');
 linkFiber();
 
 // module.exports = linkFiber;

dev-reactime/linkFiber.js

@@ -70,17 +70,13 @@ export default (snap, mode) => {
     alwaysLog('sendSnapshot called');
     // Don't send messages while jumping or while paused
     circularComponentTable.clear();
-    // console.log('sending snapshot');
     if (mode.jumping || mode.paused) return;
-    // console.log('PAYLOAD: before cleaning', snap.tree);
 
     if (!snap.tree) {
-      // console.log('snapshot empty, sending root');
       snap.tree = new Tree('root', 'root');
     }
     const payload = snap.tree.cleanTreeCopy();// snap.tree.getCopy();
 
-    // console.log('PAYLOAD: after cleaning', payload);
     // try {
       // await window.postMessage({
       window.postMessage({
@@ -118,7 +114,6 @@ export default (snap, mode) => {
   let ctRunning = 0;
   function createTree(currentFiber, tree = new Tree('root', 'root'), fromSibling = false) {
     // Base case: child or sibling pointed to null
-    console.log('createTree: creating tree');
     if (!currentFiber) return null;
     if (!tree) return tree;
 
@@ -145,7 +140,6 @@ export default (snap, mode) => {
     if (stateNode && stateNode.state && (tag === 0 || tag === 1 || tag ===2)) { // { || tag === 2)) {
       // Save component's state and setState() function to our record for future
       // time-travel state changing. Add record index to snapshot so we can retrieve.
-      console.log('createTree() found setState component');
       componentData.index = componentActionsRecord.saveNew(stateNode.state, stateNode);
       newState = stateNode.state;
       componentFound = true;
@@ -155,7 +149,6 @@ export default (snap, mode) => {
     let hooksIndex;
     if (memoizedState && (tag === 0 || tag === 1 || tag === 2 || tag === 10)) {
       if (memoizedState.queue) {
-        console.log('createTree() found hooks component');
         // Hooks states are stored as a linked list using memoizedState.next,
         // so we must traverse through the list and get the states.
         // We then store them along with the corresponding memoizedState.queue,
@@ -176,10 +169,9 @@ export default (snap, mode) => {
     }
 
     // This grabs stateless components
-    /*
     if (!componentFound && (tag === 0 || tag === 1 || tag === 2)) {
       newState = 'stateless';
-    }*/
+    }
 
     // Adds performance metrics to the component data
     componentData = {
@@ -193,18 +185,15 @@ export default (snap, mode) => {
     let newNode = null;
     if (componentFound || newState === 'stateless') {
       if (fromSibling) {
-        console.log('createTree(), relevant component found in sibling');
         newNode = tree.addSibling(newState,
           elementType ? elementType.name : 'nameless',
           componentData);
       } else {
-        console.log('createTree(), relevant component found in child');
         newNode = tree.addChild(newState,
           elementType ? elementType.name : 'nameless',
           componentData);
       }
     } else {
-      console.log('createTree(), no new relevant nodes, continuing from same node')
       newNode = tree;
     }
 
@@ -214,13 +203,11 @@ export default (snap, mode) => {
       // If this node had state we appended to the children array,
       // so attach children to the newly appended child.
       // Otherwise, attach children to this same node.
-      console.log('going into child');
       circularComponentTable.add(child);
       createTree(child, newNode);
     }
     // Recurse on siblings
     if (sibling && !circularComponentTable.has(sibling)) {
-      console.log('going into sibling');
       circularComponentTable.add(sibling);
       createTree(sibling, newNode, true);
     }
@@ -233,21 +220,17 @@ export default (snap, mode) => {
       console.log('found circular sibling, exiting tree loop');
     }
 
-    // // console.log('linkFiber.js: processed children and sibling, returning tree');
     return tree;
   }
 
   let updateSnapshotTreeCount = 0;
   function updateSnapShotTree() {
-    // console.log('updateSnapshotTree(), checking if fiberRoot updated');
 
     updateSnapshotTreeCount++;
     if (updateSnapshotTreeCount > 1) alwaysLog('MULTIPLE SNAPSHOT TREE UPDATES:', updateSnapshotTreeCount);
     if (fiberRoot) {
-      console.log('updateSnapshotTree(), updating snapshot', snap.tree);
       const { current } = fiberRoot;
       snap.tree = createTree(current);
-      console.log('updateSnapshotTree(), completed snapshot', snap.tree);
     }
     updateSnapshotTreeCount--;
   }
@@ -274,11 +257,8 @@ export default (snap, mode) => {
       devTools.onCommitFiberRoot = (function (original) {
         return function (...args) {
           fiberRoot = args[1];
-          //console.log('Fiber committed, updating snapshot tree with:', fiberRoot);
           updateSnapShotTree();
-          console.log('Fiber committed, sending latest snapshot');
           sendSnapshot();
-          console.log('Fiber committed, latest snapshot sent');
           return original(...args);
         };
       }(devTools.onCommitFiberRoot));

dev-reactime/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "dev-reactime",
-  "version": "3.1.1",
+  "version": "4.0.0",
   "description": "A library that helps debug React by memorizing the state of components with every render.",
   "main": "index.js",
   "repository": {
@@ -28,11 +28,16 @@
     "Abaas Khorrami",
     "Andy Wong",
     "Bryan Lee",
+    "Carlos Perez",
     "Chris Flannery",
     "David Chai",
+    "Edwin Menendez",
     "Ergi Shehu",
+    "Gabriela Jardim Aquino",
+    "Gregory Panciera",
     "Josh Kim",
     "Joshua Howard",
+    "Nathanael Wa Mwenze",
     "Prasanna Malla",
     "Rajeeb Banstola",
     "Raymond Kwan",

dev-reactime/package.json

@@ -101,6 +101,11 @@ Reactime offers beta support for TypeScript applications using stateful class co
 
 ## Authors
 
+- **Carlos Perez** - [@crperezt](https://github.com/crperezt)
+- **Edwin Menendez** - [@edwinjmenendez](https://github.com/edwinjmenendez)
+- **Gabriela Jardim Aquino** - [@aquinojardim](https://github.com/aquinojardim)
+- **Gregory Panciera** - [@gpanciera](https://github.com/gpanciera)
+- **Nathanael Wa Mwenze** - [@nmwenz90](https://github.com/nmwenz90)
 - **Ryan Dang** - [@rydang](https://github.com/rydang)
 - **Bryan Lee** - [@mylee1995](https://github.com/mylee1995)
 - **Josh Kim** - [@joshua0308](https://github.com/joshua0308)

dev-reactime/readme.md

@@ -42,7 +42,6 @@ export default (origin, mode) => {
       target.state.hooksState.forEach(hooksState => {
         if (component && component.dispatch) {
           const hooksComponent = componentActionsRecord.getComponentByIndex(hooksState[1]);
-          // console.log('dispatch going back to hooks state: ', target.state.hooksState[0]);
           hooksComponent.dispatch(target.state.hooksState[0]);
         }
       });

dev-reactime/timeJump.js

@@ -28,15 +28,13 @@ class Tree {
   }
 
   addChild(state, name, componentData) {
-    //console.log('tree.js: in addChild');
     const newChild = new Tree(state, name, componentData);
     newChild.parent = this;
     this.children.push(newChild);
     return newChild;
   }
 
   addSibling(state, name, componentData) {
-    // console.log('tree.js: in addSibling');
     const newSibling = new Tree(state, name, componentData);
     newSibling.parent = this.parent;
     this.parent.children.push(newSibling);
@@ -74,7 +72,6 @@ class Tree {
   // BUG FIX: Don't print the Router as a component
   // Change how the children are printed
   print() {
-    // console.log('current tree structure for *this : ', this);
     const children = ['children: '];
     // DEV: What should we push instead for components using hooks (it wouldn't be state)
     // if this.children is always initialized to empty array, when would there ever be anything to iterate through here?

dev-reactime/tree.js

@@ -1,9 +1,4 @@
 const Flatted = require('flatted');
 
 
-let a = {'a': 'b', c: 3};
-
-console.log(a);
-console.log(Flatted.stringify(a));
-
-console.log(a);
+let a = {'a': 'b', c: 3};