waibu 2.13.0 → 2.14.0

package/lib/build-locals.js

@@ -1,5 +1,3 @@
-const errs = {}
-
 async function buildHomesMenu (req) {
   const { callHandler } = this.app.bajo
   const { get, find, orderBy } = this.app.lib._
@@ -52,50 +50,48 @@ async function buildPagesMenu (req) {
   return orderBy(all, ['level', 'title'])
 }
 
+const omitted = ['createdAt', 'updatedAt', '_immutable']
+
 async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
   const { runHook } = this.app.bajo
-  const { set, merge, pick, get, isEmpty, find, pullAt } = this.app.lib._
+  const { set, merge, pick, get, isEmpty, find, cloneDeep, omit } = this.app.lib._
   const { req, reply } = opts
-  params.page = merge(params.page ?? {}, { ns: req.ns, features: [] })
-  params.sidebar = params.sidebar ?? []
 
-  const { site, user, lang, darkMode } = req
-  const theme = pick(find(this.themes, { name: opts.theme ?? req.theme }) ?? {}, ['name', 'framework'])
-  const iconset = pick(find(this.iconsets, { name: opts.iconset ?? req.iconset }) ?? {}, ['name'])
-  const routeOpts = get(req, 'routeOptions.config', {})
-  const _meta = { theme, iconset, site, user, lang, darkMode, routeOpts }
-  _meta.site = _meta.site ?? {}
-  merge(_meta, pick(req, ['url', 'params', 'query']))
-  _meta.env = this.app.bajo.config.env
-  _meta.url = _meta.url.split('?')[0].split('#')[0]
-  if (req.session) _meta.prevUrl = req.session.prevUrl
-  _meta.route = get(req, 'routeOptions.url')
-  _meta.template = tpl
-  _meta.hostHeader = req.headers.host
-  _meta.statusCode = 200
-  const pulled = []
-  for (const k in errs) {
-    if (Date.now() - errs[k] > 5000) pulled.push(k)
-  }
-  pullAt(errs, pulled)
+  const _meta = { template: tpl }
   if (params.error) {
     if (params.error.statusCode) _meta.statusCode = params.error.statusCode
     _meta.errorMessage = params.error.message
     if (params.error.ns) params.page.ns = params.error.ns
-    if (!errs[req.id]) {
-      this.log.error('error%s', params.error.message)
-      if (this.app.bajo.config.env === 'dev') console.log(params.error)
-    }
-    errs[req.id] = Date.now()
+    this.log.error('error%s', params.error.message)
+    if (this.app.bajo.config.env === 'dev') console.log(params.error)
   }
-  _meta.flash = reply && req.session && req.flash && !opts.partial && !opts.noFlash ? reply.flash() : {}
   if (!opts.partial) {
+    params.page = merge(params.page ?? {}, { ns: req.ns, features: [] })
+    params.sidebar = params.sidebar ?? []
+    merge(_meta, pick(req, ['site', 'user', 'lang', 'darkMode', 'url']))
+    _meta.params = cloneDeep(req.params)
+    _meta.query = cloneDeep(req.query)
+    _meta.site = omit(req.site, omitted)
+    _meta.user = omit(req.user, [...omitted, 'apiKey', 'salt', 'token'])
+    _meta.theme = pick(find(this.themes, { name: opts.theme ?? req.theme }) ?? {}, ['name', 'framework'])
+    _meta.iconset = pick(find(this.iconsets, { name: opts.iconset ?? req.iconset }) ?? {}, ['name'])
+    _meta.routeOpts = get(req, 'routeOptions.config', {})
     set(params, 'menu.homes', await buildHomesMenu.call(this, req))
     set(params, 'menu.pages', await buildPagesMenu.call(this, req))
+    _meta.env = this.app.bajo.config.env
+    _meta.url = _meta.url.split('?')[0].split('#')[0]
+    if (req.session) _meta.prevUrl = req.session.prevUrl
+    _meta.route = get(req, 'routeOptions.url')
+    _meta.hostHeader = req.headers.host
+    _meta.statusCode = 200
+    _meta.reqId = req.id
+    _meta.flash = reply && req.session && req.flash && !opts.noFlash ? reply.flash() : {}
   }
   const merged = merge({}, params, { _meta })
-  await runHook(`${this.ns}:afterBuildLocals`, merged, req, opts)
-  if (!isEmpty(routeOpts.ns)) await runHook(`${this.ns}.${routeOpts.ns}:afterBuildLocals`, merged, req, opts)
+  if (!opts.partial) {
+    await runHook(`${this.ns}:afterBuildLocals`, merged, req, opts)
+    if (!isEmpty(merged._meta.routeOpts.ns)) await runHook(`${this.ns}.${merged._meta.routeOpts.ns}:afterBuildLocals`, merged, req, opts)
+  }
   return merged
 }
 

package/lib/handle-error.js

@@ -2,9 +2,9 @@ import { redirect } from './handle-redirect.js'
 import { notFound, writeHtml, interceptor } from './handle-not-found.js'
 
 async function error (err, req, reply) {
+  this.log.error(err)
   const resp = await interceptor.call(this, 'errorHandler', err, req, reply)
   if (resp) return resp
-  this.log.error(err)
   const payload = {
     text: this.app.log.getErrorMessage(err),
     title: req.t('internalServerError')

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2026-05-24
+
+- [2.14.0] Add auto detection of theme & iconset for all widgets incl the dynamic one
+- [2.14.0] Bug fix in ```handle-error.js```
+
 ## 2026-05-22
 
 - [2.13.0] Add ```config.log.noReq``` & ```config.log.noReply```