bajo 2.12.1 → 2.13.0

package/class/bajo.js

@@ -851,8 +851,8 @@ class Bajo extends Plugin {
   readConfig = async (file, options = {}) => {
     const { parseObject } = this.app.lib
     const { defaultsDeep } = this.app.lib.aneka
-    const { uniq, isString, isArray, findIndex, isPlainObject } = this.app.lib._
-    let { ns, baseNs, extend, checkOverride, pattern, ignoreError = true, defValue = {}, parserOpts = {}, globOpts = {} } = options
+    const { uniq, isString, isArray, findIndex, isPlainObject, merge } = this.app.lib._
+    let { ns, baseNs, extend, checkOverride, merge: merged, pattern, ignoreError = true, defValue = {}, parserOpts = {}, globOpts = {} } = options
 
     const getParseOptsArgs = (opts, orig) => {
       opts.parserOpts = opts.parserOpts ?? {}
@@ -884,19 +884,22 @@ class Bajo extends Plugin {
       if (checkOverride) {
         getParseOptsArgs(opts, orig)
         const fileExt = `${this.app.main.dir.pkg}/extend/${baseNs}/override/${ns}${suffix}/${_path}`
-        const result = parseObject(await this.readConfig(fileExt, { ...opts, extend: false, checkOverride: false }))
+        const result = parseObject(await this.readConfig(fileExt, { ...opts, extend: false, checkOverride: false, merge: false }))
         if (!isEmpty(result)) orig = result
       }
       getParseOptsArgs(opts, orig)
+      const binder = merged ? merge : defaultsDeep
       for (const base of bases) {
         if (!this.app[base]) continue
         const fileExt = `${this.app[base].dir.pkg}/extend/${baseNs}/extend/${ns}${suffix}/${_path}`
-        const result = parseObject(await this.readConfig(fileExt, { ...opts, extend: false }))
+        const result = parseObject(await this.readConfig(fileExt, { ...opts, extend: false, merge: false }))
         if (isEmpty(result)) continue
         if (isArray(result)) ext = [...result, ...ext]
-        else ext = defaultsDeep({}, result, ext)
+        else ext = binder({}, result, ext)
       }
-      return isArray(orig) ? [...orig, ...ext] : defaultsDeep({}, keys.length > 0 ? pick(ext, keys) : ext, orig)
+      if (isArray(orig)) return [...orig, ...ext]
+      const item = keys.length > 0 ? pick(ext, keys) : ext
+      return binder({}, item, orig)
     }
 
     parserOpts.readFromFile = true

package/class/plugin/err.js

@@ -103,7 +103,10 @@ class Err extends Tools {
     const detailsMessage = []
     each(value, (v, i) => {
       if (isString(v)) v = { error: v }
-      if (!v.context) return undefined
+      if (!v.context) {
+        v.error = me.plugin.t(v.error)
+        return undefined
+      }
       v.context.message = v.message
       if (v.type === 'any.only') {
         const items = without(get(v, 'context.valids', []))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "2.12.1",
+  "version": "2.13.0",
   "description": "The ultimate framework for whipping up massive apps in no time",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2026-04-28
+
+- [2.13.0] Add ```options.merge``` to ```readConfig()```
+- [2.13.0] Bug fix in ```err.js```
+
 ## 2026-04-25
 
 - [2.12.1] Bug fix in ```readConfig()```