waibu 2.13.0 → 2.15.0

package/extend/bajo/hook.js

@@ -0,0 +1,70 @@
+export const methodColor = {
+  GET: 'blue',
+  POST: 'green',
+  UPDATE: 'yellow',
+  PATCH: 'yellow',
+  DELETE: 'red'
+}
+
+async function hook () {
+  return [{
+    name: 'waibu:onClose',
+    handler: async function () {
+      this.log.info('serverIs%s', this.t('closedL'))
+    }
+  }, {
+    name: 'waibu:onReady',
+    handler: async function () {
+      this.log.info('serverIs%s', this.t('readyL'))
+    }
+  }, {
+    level: 5,
+    name: 'waibu:onRequest',
+    handler: async function onRequest (req, reply) {
+      const { importPkg } = this.app.bajo
+      const { get } = this.app.lib._
+      const chalk = await importPkg('bajo:chalk')
+      const { plain } = this.app.bajo.config.log
+
+      req.site = this.config.siteInfo
+      req.ns = get(reply.request, 'routeOptions.config.ns') ?? this.ns
+      const ns = get(reply.request, 'routeOptions.config.webApp') ?? this.ns
+      const arrow = plain ? '<' : chalk.bold('🡨')
+      const c = methodColor[req.method] ?? 'gray'
+      const method = plain ? req.method : chalk[c](req.method)
+      const url = plain ? (':' + req.url) : chalk.gray(':' + req.url)
+      const ip = plain ? this.getIp(req) : chalk.magenta(this.getIp(req))
+      let msg = this.app[ns].t('httpReq%s%s%s%s', arrow, method, url.replaceAll('%', '%%'), ip)
+      if (req.headers['content-length']) msg += this.app[ns].t('httpReqExt%s', req.headers['content-length'])
+      if (this.config.log.defer) {
+        this.reqLog = this.reqLog ?? {}
+        this.reqLog[req.id] = msg
+      } else if (!this.config.log.noReq) this.app[ns].log.info(msg)
+      if (Object.keys(this.config.paramsCharMap).length === 0) return
+      for (const key in req.params) {
+        let val = req.params[key]
+        if (typeof val !== 'string') continue
+        for (const char in this.config.paramsCharMap) {
+          val = val.replaceAll(char, this.config.paramsCharMap[char])
+        }
+        req.params[key] = val
+      }
+    }
+  }, {
+    level: 5,
+    name: 'waibu:onRoute',
+    handler: async function (opts) {
+      this.routes.push(opts)
+    }
+  }, {
+    level: 9,
+    name: 'waibu:preParsing',
+    handler: async function (req, reply) {
+      const { importModule } = this.app.bajo
+      const attachIntl = await importModule('waibu:/lib/webapp-scope/attach-intl.js')
+      await attachIntl.call(this, this.config.intl.detectors, req, reply)
+    }
+  }]
+}
+
+export default hook

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

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-05-28
+
+- [2.15.0] Change hooks to be written in one ```hook.js``` file
+- [2.15.0] Change model schemas to be written in one ```model.js``` file
+
+## 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```

package/extend/bajo/hook/waibu@on-close.js

@@ -1,5 +0,0 @@
-async function onClose () {
-  this.log.info('serverIs%s', this.t('closedL'))
-}
-
-export default onClose

package/extend/bajo/hook/waibu@on-ready.js

@@ -1,5 +0,0 @@
-async function onReady () {
-  this.log.info('serverIs%s', this.t('readyL'))
-}
-
-export default onReady

package/extend/bajo/hook/waibu@on-request.js

@@ -1,37 +0,0 @@
-import { methodColor } from './waibu@on-response.js'
-
-const onRequest = {
-  level: 5,
-  handler: async function onRequest (req, reply) {
-    const { importPkg } = this.app.bajo
-    const { get } = this.app.lib._
-    const chalk = await importPkg('bajo:chalk')
-    const { plain } = this.app.bajo.config.log
-
-    req.site = this.config.siteInfo
-    req.ns = get(reply.request, 'routeOptions.config.ns') ?? this.ns
-    const ns = get(reply.request, 'routeOptions.config.webApp') ?? this.ns
-    const arrow = plain ? '<' : chalk.bold('🡨')
-    const c = methodColor[req.method] ?? 'gray'
-    const method = plain ? req.method : chalk[c](req.method)
-    const url = plain ? (':' + req.url) : chalk.gray(':' + req.url)
-    const ip = plain ? this.getIp(req) : chalk.magenta(this.getIp(req))
-    let msg = this.app[ns].t('httpReq%s%s%s%s', arrow, method, url.replaceAll('%', '%%'), ip)
-    if (req.headers['content-length']) msg += this.app[ns].t('httpReqExt%s', req.headers['content-length'])
-    if (this.config.log.defer) {
-      this.reqLog = this.reqLog ?? {}
-      this.reqLog[req.id] = msg
-    } else if (!this.config.log.noReq) this.app[ns].log.info(msg)
-    if (Object.keys(this.config.paramsCharMap).length === 0) return
-    for (const key in req.params) {
-      let val = req.params[key]
-      if (typeof val !== 'string') continue
-      for (const char in this.config.paramsCharMap) {
-        val = val.replaceAll(char, this.config.paramsCharMap[char])
-      }
-      req.params[key] = val
-    }
-  }
-}
-
-export default onRequest

package/extend/bajo/hook/waibu@on-response.js

@@ -1,48 +0,0 @@
-export const methodColor = {
-  GET: 'blue',
-  POST: 'green',
-  UPDATE: 'yellow',
-  PATCH: 'yellow',
-  DELETE: 'red'
-}
-
-const stateColor = {
-  2: 'green',
-  3: 'yellow',
-  4: 'red',
-  5: 'red'
-}
-
-const onResponse = {
-  level: 5,
-  handler: async function onResponse (req, reply) {
-    const { importPkg } = this.app.bajo
-    const { get } = this.app.lib._
-    const { plain } = this.app.bajo.config.log
-    const chalk = await importPkg('bajo:chalk')
-    let level = 'info'
-    if (reply.statusCode >= 300 && reply.statusCode < 400) level = 'warn'
-    else if (reply.statusCode >= 400) level = 'error'
-    const ns = get(reply.request, 'routeOptions.config.webApp') ?? this.ns
-    const arrow = plain ? '>' : chalk.bold('🡪')
-    const mc = methodColor[req.method] ?? 'gray'
-    const method = plain ? req.method : chalk[mc](req.method)
-    const url = plain ? (':' + req.url) : chalk.gray(':' + req.url)
-    let state = plain ? reply.statusCode : chalk.gray(reply.statusCode)
-    const sc = stateColor[Math.floor(reply.statusCode / 100)]
-    if (!plain && sc) state = chalk[sc](reply.statusCode)
-    const elapsed = reply.elapsedTime ?? 0
-    let tc = 'red'
-    if (elapsed < 1000) tc = 'yellow'
-    if (elapsed < 500) tc = 'green'
-    const time = plain ? elapsed.toFixed(2) : chalk[tc](elapsed.toFixed(2))
-    if (this.config.log.defer) {
-      this.reqLog = this.reqLog ?? {}
-      if (this.reqLog[req.id] && !this.config.log.noReq) this.app[ns].log.info(this.reqLog[req.id])
-      delete this.reqLog[req.id]
-    }
-    if (!this.config.log.noReply) this.app[ns].log[level]('httpResp%s%s%s%s%s', arrow, method, url, state, time)
-  }
-}
-
-export default onResponse

package/extend/bajo/hook/waibu@on-route.js

@@ -1,8 +0,0 @@
-const onRoute = {
-  level: 5,
-  handler: async function (opts) {
-    this.routes.push(opts)
-  }
-}
-
-export default onRoute

package/extend/bajo/hook/waibu@pre-parsing.js

@@ -1,10 +0,0 @@
-const waibuPreParsing = {
-  level: 9,
-  handler: async function (req, reply) {
-    const { importModule } = this.app.bajo
-    const attachIntl = await importModule('waibu:/lib/webapp-scope/attach-intl.js')
-    await attachIntl.call(this, this.config.intl.detectors, req, reply)
-  }
-}
-
-export default waibuPreParsing