waibu 2.14.0 → 2.15.1

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

@@ -58,6 +58,8 @@ async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
   const { req, reply } = opts
 
   const _meta = { template: tpl }
+  params.page = merge(params.page ?? {}, { ns: req.ns, features: [] })
+  params.sidebar = params.sidebar ?? []
   if (params.error) {
     if (params.error.statusCode) _meta.statusCode = params.error.statusCode
     _meta.errorMessage = params.error.message
@@ -66,8 +68,6 @@ async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
     if (this.app.bajo.config.env === 'dev') console.log(params.error)
   }
   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)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-05-29
+
+- [2.15.1] Bug fix in ```build-locals.js```
+
+## 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

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