Throw exception if children result is not array or object (#210)

Related to #67
vaadin · Jun 29, 2018 · 5f28a9b · 5f28a9b
1 parent c65f79d
commit 5f28a9b
Show file tree

Hide file tree

Showing 3 changed files with 209 additions and 205 deletions.
diff --git a/src/router.js b/src/router.js
@@ -62,9 +62,12 @@ function amend(amendmentFunction, context, route) {
 }
 
 function processNewChildren(newChildren, route, context) {
-  if (isResultNotEmpty(newChildren) && !isObject(newChildren)) {
-    throw new Error(log(`Expected 'children' method of the route with path '${route.path}' `
-      + `to return an object, but got: '${newChildren}'`));
+  if (!Array.isArray(newChildren) && !isObject(newChildren)) {
+    throw new Error(
+      log(
+        `Incorrect "children" value for the route ${route.path}: expected array or object, but got ${newChildren}`
+      )
+    );
   }
 
   route.__children = [];

diff --git a/src/utils.js b/src/utils.js
@@ -107,7 +107,8 @@ export function fireRouterEvent(type, detail) {
 }
 
 export function isObject(o) {
-  return typeof o === 'object';
+  // guard against null passing the typeof check
+  return typeof o === 'object' && !!o;
 }
 
 export function isFunction(f) {