Adding children and parent to currentRoute

Ian Walter · Ian Walter · commit e2aa86ceb1a2 · 2017-12-15T13:24:53.000-05:00
Also adding .vscode (IDE settings file) to .gitignore
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ dist/*.gz
 dist/*.map
 explorations
 docs/_book
+.vscode
diff --git a/src/create-route-map.js b/src/create-route-map.js
@@ -74,6 +74,7 @@ function addRouteRecord (
     path: normalizedPath,
     regex: compileRouteRegex(normalizedPath, pathToRegexpOptions),
     components: route.components || { default: route.component },
+    children: route.children || [],
     instances: {},
     name,
     parent,
diff --git a/src/util/route.js b/src/util/route.js
@@ -21,6 +21,8 @@ export function createRoute (
   const route: Route = {
     name: location.name || (record && record.name),
     meta: (record && record.meta) || {},
+    children: (record && record.children) || [],
+    parent: (record && record.parent) || {},
     path: location.path || '/',
     hash: location.hash || '',
     query,
diff --git a/test/unit/specs/create-map.spec.js b/test/unit/specs/create-map.spec.js
@@ -64,6 +64,10 @@ describe('Creating Route Map', function () {
     expect(maps.nameMap['bar.baz']).not.toBeUndefined()
   })
 
+  it('has baz route in children on bar route', () => {
+    expect(maps.nameMap.bar.children[0].name).toEqual('bar.baz')
+  })
+
   it('in development, has logged a warning concerning named route of parent and default subroute', function () {
     process.env.NODE_ENV = 'development'
     maps = createRouteMap(routes)
diff --git a/test/unit/specs/create-matcher.spec.js b/test/unit/specs/create-matcher.spec.js
@@ -3,7 +3,14 @@ import { createMatcher } from '../../../src/create-matcher'
 
 const routes = [
   { path: '/', name: 'home', component: { name: 'home' }},
-  { path: '/foo', name: 'foo', component: { name: 'foo' }},
+  {
+    path: '/foo',
+    name: 'foo',
+    component: { name: 'foo' },
+    children: [
+      { path: '', name: 'foo.baz', component: { name: 'Baz' } }
+    ]
+  }
 ]
 
 describe('Creating Matcher', function () {
@@ -32,4 +39,14 @@ describe('Creating Matcher', function () {
     match({ name: 'foo' }, routes[0])
     expect(console.warn).not.toHaveBeenCalled()
   })
+
+  it('should return the matched route with children populated', () => {
+    const route = match({ name: 'foo' })
+    expect(route.children[0].name).toEqual('foo.baz')
+  })
+
+  it('should return the matched route with parent populated', () => {
+    const route = match({ name: 'foo.baz' })
+    expect(route.parent.name).toEqual('foo')
+  })
 })
