waibu 1.1.17 → 1.1.19

package/lib/build-locals.js

@@ -1,11 +1,14 @@
 async function buildHomesMenu (req) {
+  const { callHandler } = this.app.bajo
   const { get, find, orderBy } = this.lib._
   const routes = []
   for (const ns of this.app.bajo.pluginNames) {
-    const href = get(this, `app.${ns}.config.waibuMpa.home`)
-    if (!href) continue
-    const item = { href, ns, title: get(this, `app.${ns}.config.waibu.title`, this.app[ns].title) }
-    if (!find(routes, { href })) routes.push(item)
+    let home = get(this, `app.${ns}.config.waibuMpa.home`)
+    const homeHandler = get(this, `app.${ns}.config.waibuMpa.homeHandler`)
+    if (homeHandler) home = await callHandler(homeHandler)
+    if (!home) continue
+    const item = { href: home, ns, title: get(this, `app.${ns}.config.waibu.title`, this.app[ns].title) }
+    if (!find(routes, { href: home })) routes.push(item)
   }
   return orderBy(routes, ['title'])
 }

package/lib/home.js

@@ -1,9 +1,10 @@
 async function home () {
-  const { defaultsDeep } = this.app.bajo
+  const { defaultsDeep, callHandler } = this.app.bajo
   const { isString, pick } = this.lib._
   const config = this.getConfig()
   if (config.home) {
     if (isString(config.home)) config.home = { path: config.home }
+    if (config.home.pathHandler) config.home.path = await callHandler(config.home.pathHandler)
     await this.instance.get('/', async function (req, reply) {
       if (!config.home.forward) return reply.redirectTo(config.home.path)
       const opts = defaultsDeep(pick(req, ['params', 'query']), pick(config.home, ['params', 'query']))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {

package/plugin/factory.js

@@ -136,6 +136,7 @@ async function factory (pkgName) {
       const { breakNsPath } = this.app.bajo
       const { ns, subNs = '', path } = breakNsPath(route)
       return find(this.routes, r => {
+        if (r.path.startsWith('*')) return false
         r.config = r.config ?? {}
         const match = outmatch(r.config.pathSrc ?? r.path, { separator: false })
         if (!match(path)) return false