waibu 1.1.16 → 1.1.18

package/lib/build-locals.js

@@ -1,21 +1,26 @@
-function buildHomesMenu (req) {
+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'])
 }
 
-function buildPagesMenu (req) {
-  const { find, orderBy, merge } = this.lib._
+async function buildPagesMenu (req) {
+  const { find, orderBy, merge, isString } = this.lib._
+  const { callHandler } = this.app.bajo
   const all = [{ icon: 'house', href: '/', level: 1 }]
   for (const ns of this.app.bajo.pluginNames) {
     const items = []
-    const pages = this.app[ns].getConfig('waibuMpa.pages', { defValue: [] })
+    let pages = this.app[ns].getConfig('waibuMpa.menuHandler', { defValue: [] })
+    if (isString(pages)) pages = await callHandler(pages, req)
     if (pages.length === 0) continue
     for (const page of pages) {
       const existing = find(all, { title: page.title })
@@ -77,8 +82,8 @@ async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
     if (this.app.bajo.config.env === 'dev') console.log(params.error)
   }
   if (reply && req.session && req.flash && !opts.partial) _meta.flash = reply.flash()
-  set(params, 'menu.homes', buildHomesMenu.call(this, req))
-  set(params, 'menu.pages', buildPagesMenu.call(this, req))
+  set(params, 'menu.homes', await buildHomesMenu.call(this, req))
+  set(params, 'menu.pages', await buildPagesMenu.call(this, req))
   const merged = merge({}, params, { _meta })
   await runHook(`${this.name}:afterBuildLocals`, merged, req)
   if (!isEmpty(routeOpts.ns)) await runHook(`${this.name}.${routeOpts.ns}:afterBuildLocals`, merged, req)

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.16",
+  "version": "1.1.18",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {