Merge pull request #41 from oslabs-beta/staging

Staging

Author: crperezt

dev-reactime/index.js

@@ -4,24 +4,29 @@
  */
 import 'core-js';
 import 'regenerator-runtime/runtime';
-import { exist } from 'acorn-jsx/xhtml';
+import linkFiberStart from './linkFiber';
+import timeJumpStart from './timeJump';
 
 // * State snapshot object initialized here
 const snapShot = { 
-  tree: null, 
-  unfilteredTree: null 
+  tree: null,
+  unfilteredTree: null
 };
 
-
 const mode = {
   jumping: false,
   paused: false,
   locked: false,
 };
 
-const linkFiber = require('./linkFiber')(snapShot, mode);
-console.log('import timeJump in index.js:', JSON.parse(JSON.stringify(snapShot)));
-const timeJump = require('./timeJump')(snapShot, 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);
+
+
+
+const linkFiber = linkFiberStart(snapShot, mode);
+const timeJump = timeJumpStart(snapShot, mode);
 
 
 function getRouteURL(node) {
@@ -40,7 +45,7 @@ function getRouteURL(node) {
 window.addEventListener('message', ({ data: { action, payload } }) => {
   switch (action) {
     case 'jumpToSnap':
-      console.log('payload in jumpToSnap', payload);
+      // 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
@@ -59,5 +64,8 @@ window.addEventListener('message', ({ data: { action, payload } }) => {
   }
 });
 
+console.log('index.js: loading reactime');
+linkFiber();
+
 // module.exports = linkFiber;
-export default linkFiber;
+// export default linkFiber;

dev-reactime/linkFiber.js

@@ -44,26 +44,41 @@
 /* eslint-disable no-use-before-define */
 /* eslint-disable no-param-reassign */
 
-const Tree = require('./tree');
-const componentActionsRecord = require('./masterState');
+// const Tree = require('./tree').default;
+// const componentActionsRecord = require('./masterState');\
 
-module.exports = (snap, mode) => {
+import Tree from './tree';
+import componentActionsRecord from './masterState';
+
+const circularComponentTable = new Map();
+
+// module.exports = (snap, mode) => {
+export default (snap, mode) => {
   let fiberRoot = null;
 
-  async function sendSnapshot() {
+  function sendSnapshot() {
     // 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);
+    // 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({
+
+    // console.log('PAYLOAD: after cleaning', payload);
+    // try {
+      // await window.postMessage({
+      window.postMessage({
         action: 'recordSnap',
         payload,
       });
-    } catch (e) {
-      console.log('failed to send postMessage:', e);
-    }
+    // } catch (e) {
+    //   console.log('failed to send postMessage:', e);
+    // }
   }
 
   // Carlos: Injects instrumentation to update our state tree every time
@@ -75,13 +90,11 @@ module.exports = (snap, mode) => {
       // prevents useEffect from crashing on load
       // if (memoizedState.next.queue === null) { // prevents double pushing snapshot updates
       if (memoizedState.memoizedState) {
-        console.log('memoizedState in traverseHooks is:', memoizedState);
         hooksStates.push({
           component: memoizedState.queue,
           state: memoizedState.memoizedState,
         });
       }
-      // console.log('GOT STATE', memoizedState.memoizedState);
       memoizedState = memoizedState.next !== memoizedState
         ? memoizedState.next : null;
     }
@@ -90,8 +103,9 @@ module.exports = (snap, mode) => {
 
   // Carlos: This runs after EVERY Fiber commit. It creates a new snapshot,
   //
-  function createTree(currentFiber, tree = new Tree('root')) {
+  function createTree(currentFiber, tree = new Tree('root', 'root'), fromSibling = false) {
     // Base case: child or sibling pointed to null
+    // console.log('linkFiber.js: creating tree');
     if (!currentFiber) return null;
     if (!tree) return tree;
 
@@ -115,11 +129,10 @@ module.exports = (snap, mode) => {
     let componentFound = false;
 
     // Check if node is a stateful setState component
-    if (stateNode && stateNode.state && (tag === 0 || tag === 1)) {
-      console.log('in create tree if');
-      console.log('this is currentFiber from createTree', currentFiber);
+    if (stateNode && stateNode.state && (tag === 0 || tag === 1 || 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('linkFiber.js: found stateNode component');
       componentData.index = componentActionsRecord.saveNew(stateNode.state, stateNode);
       newState = stateNode.state;
       componentFound = true;
@@ -128,9 +141,8 @@ module.exports = (snap, mode) => {
     // Check if node is a hooks useState function
     let hooksIndex;
     if (memoizedState && (tag === 0 || tag === 1 || tag === 10)) {
-      console.log('in create tree if');
-      console.log('this is currentFiber from createTree', currentFiber);
       if (memoizedState.queue) {
+        // console.log('linkFiber.js: 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,
@@ -151,7 +163,7 @@ module.exports = (snap, mode) => {
     }
 
     // This grabs stateless components
-    if (!componentFound && (tag === 0 || tag === 1)) {
+    if (!componentFound && (tag === 0 || tag === 1 || tag === 2)) {
       newState = 'stateless';
     }
 
@@ -164,52 +176,55 @@ module.exports = (snap, mode) => {
       treeBaseDuration,
     };
 
-    if (componentFound) {
-      tree.addChild(newState, elementType.name ? elementType.name : elementType, componentData);
-    } else if (newState === 'stateless') {
-      tree.addChild(newState, elementType.name ? elementType.name : elementType, componentData);
+    let newNode = null;
+    if (componentFound || newState === 'stateless') {
+      if (fromSibling) {
+        newNode = tree.addSibling(newState, 
+          elementType.name ? elementType.name : elementType,
+          componentData);
+      } else {
+        newNode = tree.addChild(newState, 
+          elementType.name ? elementType.name : elementType,
+          componentData);
+      }
+    } else {
+      newNode = tree;
     }
 
     // Recurse on children
-    if (child) {
+    
+    if (child) { // && !circularComponentTable.has(child)) {
       // 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.
-      if (tree.children.length > 0) {
-        createTree(child, tree.children[tree.children.length - 1]);
-      } else {
-        createTree(child, tree);
-      }
+      // console.log('going into child');
+      // circularComponentTable.set(child, true);
+      createTree(child, newNode);
     }
     // Recurse on siblings
-    if (sibling) createTree(sibling, tree);
+    if (sibling) { // && !circularComponentTable.has(sibling)) {
+      // console.log('going into sibling');
+      // circularComponentTable.set(sibling, true);
+      createTree(sibling, newNode, true);
+    }
 
+    // console.log('linkFiber.js: processed children and sibling, returning tree');
     return tree;
   }
 
-  // ! BUG: skips 1st hook click
   function updateSnapShotTree() {
-    /* let current;
-    // If concurrent mode, grab current.child
-    if (concurrent) {
-      // we need a way to wait for current child to populate
-      const promise = new Promise((resolve, reject) => {
-        setTimeout(() => resolve(fiberRoot.current.child), 400);
-      });
-      current = await promise;
-      current = fiberRoot.current.child;
-    } else {
-      current = fiberRoot.current;
-    } */
-    const { current } = fiberRoot; // Carlos: get rid of concurrent mode for now
-
-    // console.log('FIBER COMMITTED, new fiber is:', util.inspect(current, false, 4));
-    // fs.appendFile('fiberlog.txt', util.inspect(current, false, 10));
-    snap.tree = createTree(current); // Carlos: pass new hooks state here?
+    // console.log('linkFiber.js, updateSnapshotTree(), checking if fiberRoot updated');
+    if (fiberRoot) {
+      // console.log('linkFiber.js, updateSnapshotTree(), updating snapshot', snap.tree);
+      const { current } = fiberRoot;
+      snap.tree = createTree(current);
+      // console.log('linkFiber.js, updateSnapshotTree(), completed snapshot', snap.tree);
+    }
   }
 
-  return async container => {
-    // Point fiberRoot to FiberRootNode
+  return async () => {
+
+    const container = document.getElementById('root');
     if (container._internalRoot) {
       fiberRoot = container._internalRoot;
     } else {
@@ -220,28 +235,31 @@ module.exports = (snap, mode) => {
       // Only assign internal root if it actually exists
       fiberRoot = _internalRoot || _reactRootContainer;
     }
+
     const devTools = window.__REACT_DEVTOOLS_GLOBAL_HOOK__;
-    console.log('this is devTools', devTools);
     const reactInstance = devTools ? devTools.renderers.get(1) : null;
 
+    //console.log('fiberRoot retrieved:', fiberRoot);
     if (reactInstance && reactInstance.version) {
       devTools.onCommitFiberRoot = (function (original) {
         return function (...args) {
           fiberRoot = args[1];
-          console.log('this is fiberRoot', fiberRoot);
           updateSnapShotTree();
           sendSnapshot();
           return original(...args);
         };
       }(devTools.onCommitFiberRoot));
     }
     updateSnapShotTree();
+    sendSnapshot();
+    // updateSnapShotTree();
     // Send the initial snapshot once the content script has started up
     // This message is sent from contentScript.js in chrome extension bundles
-    window.addEventListener('message', ({ data: { action } }) => {
-      if (action === 'contentScriptStarted') {
-        sendSnapshot();
-      }
-    });
+    // window.addEventListener('message', ({ data: { action } }) => {
+    //   if (action === 'contentScriptStarted') {
+    //     // console.log('content script started received at linkFiber.js')
+    //     sendSnapshot();
+    //   }
+    // });
   };
 };

dev-reactime/masterState.js

@@ -5,7 +5,8 @@
 const componentActionsRecord = {};
 let index = 0;
 
-module.exports = {
+// module.exports = {
+export default {
   saveNew: (state, component) => {
     componentActionsRecord[index] = { state, component };
     index++;

dev-reactime/timeJump.js

@@ -11,11 +11,13 @@
 
 /* eslint-disable no-param-reassign */
 
-const componentActionsRecord = require('./masterState');
+// const componentActionsRecord = require('./masterState');
+import componentActionsRecord from './masterState';
 
 // Carlos: origin is latest snapshot, linking to the fiber,
 // so changes to origin change app
-module.exports = (origin, mode) => {
+// module.exports = (origin, mode) => {
+export default (origin, mode) => {
   // Recursively change state of tree
   // Carlos: target is past state we are travelling to
 
@@ -40,6 +42,7 @@ module.exports = (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]);
         }
       });
@@ -49,47 +52,6 @@ module.exports = (origin, mode) => {
     if ((!component || !component.state) && !target.state.hooksState) {
       target.children.forEach(child => jump(child));
     }
-
-
-
-    /*
-    if (originNode.component.setState) {
-      console.log('stateful component jump, originNode: ', originNode.component);
-      console.log('new target is:', target);
-      // * Use the function argument when setting state to account for any state properties
-      // * that may not have existed in the past
-      originNode.component.setState(prevState => {
-        Object.keys(prevState).forEach(key => {
-          if (target.state[key] === undefined) {
-            target.state[key] = undefined;
-          }
-        });
-        return target.state;
-      }, () => {
-        // Iterate through new children once state has been set
-        // gabi :: Will the target and origin have the same amount of dependents?
-        // carlos: i don't know wtf
-        jump(target.children[0], originNode.children[0]);
-      });
-    } else {
-      // If component uses hooks, traverse through the memoize tree
-      let current = originNode.component;
-      //console.log("changing state of hooks component:", current);
-      //console.log("new state is:", target);
-      let index = 0;
-      const hooks = returnState();
-      // While loop through the memoize tree
-      console.log('hooks:', hooks);
-      while (current && current.queue) { // allows time travel with useEffect
-        console.log('about to call hooks dispatch, target state is: ', target);
-        //console.log('calling dispatch with arg:', target.state[hooks[index]]);
-        current.queue.dispatch(target.state[hooks[index]]);
-        // Reassign the current value
-        current = current.next;
-        index += 2;
-      }
-    }
-    */
   }
 
   return target => {