feat: 优化路由的解析，优化错误的显示

Author: bencode

.gitignore

@@ -1,2 +1,2 @@
 node_modules/
-yarn.lock
+yarn.lock

lib/components/core/errorHandler.js

@@ -31,7 +31,11 @@ function getMessage(env, e) {
   }
 
   if (env === 'development') {
-    return util.inspect(e) + '\n' + (e.stack || '');
+    return util.inspect(e);
+  }
+
+  if (e.code === 'ERR_ASSERTION') {
+    return e.message;
   }
 
   return 'Internel Server Error';

lib/components/router/Router.js

@@ -16,9 +16,9 @@ module.exports = class Router {
    *  目前路由匹配是使用`path-to-regexp`这个库来实现的
    *  它可以很方便地将路径样式的字符串转换成正则表达式
    *
-   * @param {String|Object} rule     - 定位的规则
+   * @param {Object} rule            - 定位的规则
    * @param {Object} options         - 额外的选项
-   *  - method {String|Array} 只允许指定method
+   *  - method {String|Array} 指定method
    */
   add(pattern, rule, options = {}) {
     const keys = [];
@@ -28,7 +28,6 @@ module.exports = class Router {
       return rNum.test(name) ? null : { index: index + 1, name };
     }).filter(v => v);
 
-    rule = typeof rule === 'string' ? parseRule(rule) : rule;
     const item = { regexp, queries, rule, options };
     debug('add %o', item);
     this.routes.push(item);
@@ -87,10 +86,6 @@ function verifyRequest(item, request) {
   return method.indexOf(current) !== -1;
 }
 
-function parseRule(rule) {
-  const parts = rule.split('#');
-  return { module: parts[0], action: parts[1] };
-}
 
 function createRouteInfo(item, match) {
   const { rule, queries } = item;
@@ -100,5 +95,5 @@ function createRouteInfo(item, match) {
   }, {});
 
   const query = rule.query ? { ...paramQuery, ...rule.query } : paramQuery;
-  return { module: rule.module, action: rule.action, query };
+  return { ...rule, query };
 }

lib/components/router/parse.js

@@ -35,10 +35,10 @@ module.exports = function parse(fn) {
    * ...
    */
   VERBS.forEach(verb => {
-    router[verb] = function(match, to) {
+    router[verb] = function(match, to, options) {
       const item = {
         match: withStateMatch(states, match),
-        to: withStateOptions(states, parseRule(to)),
+        to: withStateOptions(states, parseRule(to, options)),
         verb: verb
       };
       routes.push(item);
@@ -140,12 +140,12 @@ module.exports = function parse(fn) {
 
 
 const rRule = /^([^#:]+)[#:](.+)$/;
-function parseRule(rule) {
+function parseRule(rule, options) {
   if (typeof rule === 'string') {
     const match = rRule.exec(rule);
     rule = { module: match[1], action: match[2] };
   }
-  return rule;
+  return { ...rule, ...options };
 }