From f8c7b5c0121b72fdf928fa2fdb1318156cf0c3e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@chopin.io>
Date: Mon, 12 Dec 2016 16:30:07 +0100
Subject: [PATCH] Add validate option

---
 examples/custom-routes/nuxt.config.js         | 23 -------------------
 .../custom-routes/pages/projects/_slug.vue    |  8 +++++++
 .../custom-routes/pages/projects/index.vue    |  2 +-
 lib/app/client.js                             | 12 ++++++++++
 lib/app/router.js                             | 14 +++++------
 lib/app/server.js                             | 22 ++++++++++++++++--
 6 files changed, 48 insertions(+), 33 deletions(-)

diff --git a/examples/custom-routes/nuxt.config.js b/examples/custom-routes/nuxt.config.js
index 38fa87ebb2..bb0765f744 100644
--- a/examples/custom-routes/nuxt.config.js
+++ b/examples/custom-routes/nuxt.config.js
@@ -1,27 +1,4 @@
 module.exports = {
-  router: {
-    routes: {
-      // author: {
-      //   alias: '/nuxt'
-      // },
-      // users: {
-      //   _id: {
-      //     regexp: ':id(\\d+)'
-      //     // generate: [1, 2, 3, 4] // Need to be finished on generate
-      //   }
-      // },
-      // posts: {
-      //   alias: '/articles'
-      // }
-    }
-  },
-  // generate: {
-  //   routeParams: {
-  //     '/guide/:slug': _(require('./static/docs/guide/menu.json')).values().flatten().map('to').compact().map((slug) => { return { slug: slug.replace(/^\//, '') } }).value(),
-  //     '/api/:slug': _(require('./static/docs/api/menu.json')).values().flatten().map('to').compact().map((slug) => { return { slug: slug.replace(/^\//, '') } }).value(),
-  //     '/examples/:slug': _(require('./static/docs/examples/menu.json')).values().flatten().map('to').compact().map((slug) => { return { slug: slug.replace(/^\//, '') } }).value()
-  //   }
-  // },
   build: {
     vendor: ['axios']
   }
diff --git a/examples/custom-routes/pages/projects/_slug.vue b/examples/custom-routes/pages/projects/_slug.vue
index 0b1fba7bc0..bc9ae4ecd1 100644
--- a/examples/custom-routes/pages/projects/_slug.vue
+++ b/examples/custom-routes/pages/projects/_slug.vue
@@ -8,6 +8,14 @@
   </div>
 </template>
 
+<script>
+export default {
+  validate ({ params }) {
+    return /^[A-z]+$/.test(params.slug)
+  }
+}
+</script>
+
 <style scoped>
 p
 {
diff --git a/examples/custom-routes/pages/projects/index.vue b/examples/custom-routes/pages/projects/index.vue
index 152b470ab6..4a1026b0cd 100644
--- a/examples/custom-routes/pages/projects/index.vue
+++ b/examples/custom-routes/pages/projects/index.vue
@@ -3,7 +3,7 @@
     <h1>Dynamic route example</h1>
     <h2>Projects list</h2>
     <p>
-      <router-link :to="{ name: 'projects-slug', params: { slug: 'nuxt.js'} }">
+      <router-link :to="{ name: 'projects-slug', params: { slug: 'nuxtjs'} }">
         Nuxt.js
       </router-link>
     </p>
diff --git a/lib/app/client.js b/lib/app/client.js
index c5f9dafaf4..a9a2c2cf2a 100644
--- a/lib/app/client.js
+++ b/lib/app/client.js
@@ -70,6 +70,17 @@ function render (to, ___, next) {
   this.setTransition(Components[0].options.transition)
   this.error()
   let nextCalled = false
+  let isValid = Components.some((Component) => {
+    if (typeof Component.options.validate !== 'function') return true
+    return Component.options.validate({
+      params: to.params || {},
+      query: to.query || {}
+    })
+  })
+  if (!isValid) {
+    this.error({ statusCode: 404, message: 'This page could not be found.', url: to.path })
+    return next()
+  }
   Promise.all(Components.map((Component) => {
     let promises = []
     const _next = function (path) {
@@ -78,6 +89,7 @@ function render (to, ___, next) {
       next(path)
     }
     const context = getContext({ to<%= (store ? ', store' : '') %>, isClient: true, next: _next.bind(this), error: this.error.bind(this) })
+    // Validate method
     if (Component._data && typeof Component._data === 'function') {
       var promise = promisify(Component._data, context)
       promise.then((data) => {
diff --git a/lib/app/router.js b/lib/app/router.js
index 7c94ceba75..e603f68cb4 100644
--- a/lib/app/router.js
+++ b/lib/app/router.js
@@ -6,22 +6,22 @@ import Router from 'vue-router'
 Vue.use(Router)
 
 <%
-let components = []
-function recursiveRoutes(routes, tab) {
-  let res = ''
+function recursiveRoutes(routes, tab, components) {
+  var res = ''
   routes.forEach((route, i) => {
     components.push({ _name: route._name, component: route.component })
     res += tab + '{\n'
     res += tab + '\tpath: ' + JSON.stringify(route.path) + ',\n'
     res += tab + '\tcomponent: ' + route._name
     res += (route.name) ? ',\n\t' + tab + 'name: ' + JSON.stringify(route.name) : ''
-    res += (route.children) ? ',\n\t' + tab + 'children: [\n' + recursiveRoutes(routes[i].children, tab + '\t\t') + '\n\t' + tab + ']' : ''
+    res += (route.children) ? ',\n\t' + tab + 'children: [\n' + recursiveRoutes(routes[i].children, tab + '\t\t', components) + '\n\t' + tab + ']' : ''
     res += '\n' + tab + '}' + (i + 1 === routes.length ? '' : ',\n')
   })
   return res
 }
-let routes = recursiveRoutes(router.routes, '\t\t')
-uniqBy(components, '_name').forEach((route) => { %>
+var _components = []
+var _routes = recursiveRoutes(router.routes, '\t\t', _components)
+uniqBy(_components, '_name').forEach((route) => { %>
 const <%= route._name %> = process.BROWSER_BUILD ? () => System.import('<%= route.component %>') : require('<%= route.component %>')
 <% }) %>
 
@@ -49,6 +49,6 @@ export default new Router({
   linkActiveClass: '<%= router.linkActiveClass %>',
   scrollBehavior,
   routes: [
-<%= routes %>
+<%= _routes %>
   ]
 })
diff --git a/lib/app/server.js b/lib/app/server.js
index 5e4af2e53b..ea7e4a74e4 100644
--- a/lib/app/server.js
+++ b/lib/app/server.js
@@ -60,8 +60,8 @@ export default context => {
   <% } %>
   return promise
   .then(() => {
-    // Call data & fetch hooks on components matched by the route.
-    return Promise.all(Components.map((Component) => {
+    // Sanitize Components
+    Components = Components.map((Component) => {
       let promises = []
       if (!Component.options) {
         Component = Vue.extend(Component)
@@ -70,6 +70,24 @@ export default context => {
         Component._Ctor = Component
         Component.extendOptions = Component.options
       }
+      return Component
+    })
+    // Call .validate()
+    let isValid = Components.some((Component) => {
+      if (typeof Component.options.validate !== 'function') return true
+      return Component.options.validate({
+        params: context.route.params || {},
+        query: context.route.query || {}
+      })
+    })
+    if (!isValid) {
+      // Call the 404 error by making the Components array empty
+      Components = []
+      return _app
+    }
+    // Call data & fetch hooks on components matched by the route.
+    return Promise.all(Components.map((Component) => {
+      let promises = []
       const ctx = getContext(context)
       if (Component.options.data && typeof Component.options.data === 'function') {
         Component._data = Component.options.data