Rename some helper methods

Author: mjackson

modules/__tests__/Router-test.js

@@ -812,8 +812,6 @@ describe('Router.run', function () {
   it('matches a root route', function (done) {
     var routes = <Route path="/" handler={EchoFooProp} />;
     Router.run(routes, '/', function (Handler, state) {
-      // TODO: figure out why we're getting this warning here
-      // WARN: 'Warning: You cannot pass children to a RouteHandler'
       var html = React.renderToString(<Handler foo="bar"/>);
       expect(html).toMatch(/bar/);
       done();

modules/createRouter.js

@@ -11,7 +11,8 @@ var RefreshLocation = require('./locations/RefreshLocation');
 var NavigationContext = require('./NavigationContext');
 var StateContext = require('./StateContext');
 var Scrolling = require('./Scrolling');
-var createRoutesFromChildren = require('./createRoutesFromChildren');
+var createRoutesFromReactChildren = require('./createRoutesFromReactChildren');
+var isReactChildren = require('./isReactChildren');
 var Transition = require('./Transition');
 var PropTypes = require('./PropTypes');
 var Redirect = require('./Redirect');
@@ -140,11 +141,8 @@ function hasMatch(routes, route, prevParams, nextParams, prevQuery, nextQuery) {
 function createRouter(options) {
   options = options || {};
 
-  if (typeof options === 'function') {
-    options = { routes: options }; // Router.create(<Route>)
-  } else if (Array.isArray(options)) {
-    options = { routes: options }; // Router.create([ <Route>, <Route> ])
-  }
+  if (isReactChildren(options))
+    options = { routes: options };
 
   var routes = [];
   var namedRoutes = {};
@@ -200,20 +198,23 @@ function createRouter(options) {
       /**
        * Adds routes to this router from the given children object (see ReactChildren).
        */
-      addRoutes: function (children) {
-        routes.push.apply(routes, createRoutesFromChildren(children, this, namedRoutes));
+      addRoutes: function (newRoutes) {
+        if (isReactChildren(newRoutes))
+          newRoutes = createRoutesFromReactChildren(newRoutes, this, namedRoutes);
+
+        routes.push.apply(routes, newRoutes);
       },
 
       /**
        * Replaces routes of this router from the given children object (see ReactChildren).
        */
-      replaceRoutes: function (children) {
+      replaceRoutes: function (newRoutes) {
         cancelPendingTransition();
 
         routes = [];
         namedRoutes = {};
 
-        this.addRoutes(children);
+        this.addRoutes(newRoutes);
         this.refresh();
       },
 

modules/createRoutesFromChildren.js renamed to modules/createRoutesFromReactChildren.js

@@ -5,7 +5,6 @@ var invariant = require('react/lib/invariant');
 var DefaultRoute = require('./components/DefaultRoute');
 var NotFoundRoute = require('./components/NotFoundRoute');
 var Redirect = require('./components/Redirect');
-var Route = require('./components/Route');
 var Path = require('./utils/Path');
 
 function createRedirectHandler(to, _params, _query) {
@@ -127,15 +126,15 @@ function createRoute(element, parentRoute, namedRoutes) {
     return null;
   }
 
-  route.childRoutes = createRoutesFromChildren(props.children, route, namedRoutes);
+  route.childRoutes = createRoutesFromReactChildren(props.children, route, namedRoutes);
 
   return route;
 }
 
 /**
  * Creates and returns an array of route objects from the given ReactChildren.
  */
-function createRoutesFromChildren(children, parentRoute, namedRoutes) {
+function createRoutesFromReactChildren(children, parentRoute, namedRoutes) {
   var routes = [];
 
   React.Children.forEach(children, function (child) {
@@ -147,4 +146,4 @@ function createRoutesFromChildren(children, parentRoute, namedRoutes) {
   return routes;
 }
 
-module.exports = createRoutesFromChildren;
+module.exports = createRoutesFromReactChildren;

modules/isReactChildren.js

@@ -0,0 +1,11 @@
+var React = require('react');
+
+function isValidChild(object) {
+  return object == null || React.isValidElement(object);
+}
+
+function isReactChildren(object) {
+  return isValidChild(object) || (Array.isArray(object) && object.every(isValidChild));
+}
+
+module.exports = isReactChildren;