waibu 2.10.0 → 2.11.1

package/index.js

@@ -579,6 +579,20 @@ async function factory (pkgName) {
       })
       return result.join(delimiter)
     }
+
+    getSetting = (key, { defValue, req = {} } = {}) => {
+      const { breakNsPath } = this.app.bajo
+      const { get, isPlainObject, isArray } = this.app.lib._
+      const { defaultsDeep } = this.app.lib.aneka
+      let { ns, path } = breakNsPath(key)
+      const paths = path.replaceAll('/', '.').split('.')
+      if (paths[0] === '') paths.shift()
+      path = paths.join('.')
+      const cfgValue = get(this.app, `${ns}.config.${path}`)
+      const reqValue = get(req, `site.setting.${ns}.${path}`)
+      if (isPlainObject(cfgValue) || isArray(cfgValue)) return defaultsDeep({}, reqValue, cfgValue, defValue)
+      return reqValue ?? cfgValue ?? defValue
+    }
   }
 
   return Waibu

package/lib/decorate.js

@@ -1,6 +1,6 @@
 async function decorate () {
-  const { get } = this.app.lib._
-  const { breakNsPath } = this.app.bajo
+  const { isPlainObject, isArray } = this.app.lib._
+  const { defaultsDeep } = this.app.lib.aneka
   const me = this
   this.instance.decorateRequest('lang', null)
   this.instance.decorateRequest('t', () => {})
@@ -9,12 +9,9 @@ async function decorate () {
   this.instance.decorateRequest('site', null)
   this.instance.decorateRequest('ns', null)
   this.instance.decorateRequest('getSetting', function (key, defValue) {
-    let { ns, path } = breakNsPath(key)
-    const paths = path.replaceAll('/', '.').split('.')
-    if (paths[0] === '') paths.shift()
-    path = paths.join('.')
-    const cfgValue = get(me.app, `${ns}.config.${path}`, defValue)
-    return get(this, `site.setting.${ns}.${path}`, cfgValue)
+    const value = me.app.waibu.getSetting(key, { req: this })
+    if (isPlainObject(value) || isArray(value)) return defaultsDeep({}, value, defValue)
+    return value ?? defValue
   })
 }
 

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-04-19
+
+- [2.11.1] Bug fix in ```getSetting()```
+- [2.11.1] Bug fix in ```decorate.js```
+
+## 2026-04-13
+
+- [2.11.0] Add ```getSetting()```
+- [2.11.0] ```req.getSetting()``` now accept setting ```site.setting``` too
+
 ## 2026-04-11
 
 - [2.10.0] Move all decorator to own file ```decorator.js```