Merge pull request #65 from oneut/2.0-dev-create_runner

Create runner

src/lib/Connector.js

@@ -23,15 +23,9 @@ export default class Connector {
   }
 
   init(history) {
-    // Settings HistoryManager.
     this.initHistory(history);
-
-    // Settings RxJS Stream.
     this.initRouteMatcher();
-
-    // Initial RouteMatcher
     this.initStream();
-
     return this;
   }
 

src/lib/Router.js

@@ -1,9 +1,12 @@
-import React from "react";
-import RootComponent from "./RootComponent";
+import InitialPropsRunner from "./runner/InitialPropsRunner";
+import FirstComponentLoadRunner from "./runner/FirstComponentLoadRunner";
+import LoadRunner from "./runner/LoadRunner";
 
 export default class Router {
   constructor(connector) {
     this.connector = connector;
+    this.initialProps = null;
+    this.firstComponent = null;
   }
 
   route(path, component, name) {
@@ -15,20 +18,27 @@ export default class Router {
   }
 
   setFirstComponent(component) {
-    this.connector.componentResolver.setComponent(component);
+    this.firstComponent = component;
+  }
+
+  setInitialProps(initialProps) {
+    this.initialProps = initialProps;
   }
 
   run(callback) {
-    // Request current route component.
-    const location = this.connector.historyManager.getLocation();
-    this.connector.request(location.pathname);
-
-    // Create root component.
-    callback((props) => {
-      return React.createElement(RootComponent, {
-        connector: this.connector,
-        ...props
-      });
-    });
+    const runner = this.getRunner();
+    runner.run(callback);
+  }
+
+  getRunner() {
+    if (!!this.initialProps) {
+      return new InitialPropsRunner(this.connector, this.initialProps);
+    }
+
+    if (!!this.firstComponent) {
+      return new FirstComponentLoadRunner(this.connector, this.firstComponent);
+    }
+
+    return new LoadRunner(this.connector);
   }
 }

src/lib/runner/FirstComponentLoadRunner.js

@@ -0,0 +1,23 @@
+import React from "react";
+import RootComponent from "../RootComponent";
+
+export default class FirstComponentLoadRunner {
+  constructor(connector, firstComponent) {
+    this.connector = connector;
+    this.firstComponent = firstComponent;
+  }
+
+  run(callback) {
+    const location = this.connector.historyManager.getLocation();
+    this.connector.request(location.pathname);
+
+    this.connector.componentResolver.setComponent(this.firstComponent);
+
+    callback((props) => {
+      return React.createElement(RootComponent, {
+        connector: this.connector,
+        ...props
+      });
+    });
+  }
+}

src/ssr/Router.js → src/lib/runner/InitialPropsRunner.js

@@ -1,23 +1,11 @@
-import React from "react";
-import RootComponent from "../lib/RootComponent";
-import { map, skipWhile, switchMap } from "rxjs/operators";
 import { of } from "rxjs";
+import { map, skipWhile, switchMap } from "rxjs/operators";
+import React from "react";
+import RootComponent from "../RootComponent";
 
-export default class Router {
-  constructor(connector) {
+export default class InitialPropsRunner {
+  constructor(connector, initialProps) {
     this.connector = connector;
-    this.initialProps = {};
-  }
-
-  route(path, component, name) {
-    this.connector.routeMatcher.addRoute(path, component, name, false);
-  }
-
-  asyncRoute(path, component, name) {
-    this.connector.routeMatcher.addRoute(path, component, name, true);
-  }
-
-  setInitialProps(initialProps) {
     this.initialProps = initialProps;
   }
 

src/lib/runner/LoadRunner.js

@@ -0,0 +1,34 @@
+import { of } from "rxjs";
+import { map, mergeMap, skipWhile, switchMap } from "rxjs/operators";
+import React from "react";
+import RootComponent from "../RootComponent";
+
+export default class LoadRunner {
+  constructor(connector) {
+    this.connector = connector;
+  }
+
+  run(callback) {
+    const location = this.connector.historyManager.getLocation();
+
+    of(location.pathname)
+      .pipe(
+        switchMap((pathname) =>
+          this.connector.routeMatcher.createRenderer(pathname)
+        ),
+        skipWhile((renderer) => renderer === null),
+        map((renderer) => renderer.fireInitialPropsWillGet()),
+        mergeMap((renderer) => renderer.fireGetInitialProps()),
+        map((renderer) => renderer.fireInitialPropsDidGet())
+      )
+      .subscribe((renderer) => {
+        this.connector.componentResolver.setComponentFromRenderer(renderer);
+        callback((props) => {
+          return React.createElement(RootComponent, {
+            connector: this.connector,
+            ...props
+          });
+        });
+      });
+  }
+}

src/ssr/index.js

@@ -1,5 +1,5 @@
 import ServerRouter from "./ServerRouter";
-import Router from "./Router";
+import Router from "../lib/Router";
 import { connector } from "../lib/Facade";
 import { createBrowserHistory, createMemoryHistory } from "history";