bajo 2.12.0 → 2.13.0

package/class/bajo.js

@@ -851,42 +851,55 @@ 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, 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 ?? {}
+      opts.parserOpts.args = opts.parserOpts.args ?? []
+      const idx = findIndex(opts.parserOpts.args, item => {
+        return isPlainObject(item) && Object.keys(item)[0] === '_orig'
+      })
+      if (idx > -1) opts.parserOpts.args[idx] = { _orig: orig }
+      else opts.parserOpts.args.push({ _orig: orig })
+    }
 
     const output = async (obj) => {
-      const orig = parseObject(obj)
+      let orig = parseObject(obj)
       if (!baseNs || extend === false) return orig
       const { suffix = '', keys = [] } = options
       let bases = this.app.getAllNs()
       if (isString(extend)) extend = extend.split(',').map(i => i.trim)
       if (isArray(extend)) bases = [...extend, 'main']
       bases = uniq(bases)
-      let ext = isArray(obj) ? [] : {}
+      let ext = isArray(orig) ? [] : {}
       const dir = this.app[ns].dir.pkg
       let [names, _path] = file.split(':')
       if (file.slice(0, names.length + 1) !== `${ns}:`) _path = file.slice(dir.length + 1)
       if (_path.startsWith('extend/')) _path = _path.slice(7)
       if (_path.startsWith(`${baseNs}/`)) _path = _path.slice(baseNs.length + 1)
       _path = _path.slice(0, -(path.extname(_path).length)) + '.*'
+      // check for override? Override only exists in main plugin
       const opts = omit(options, ['suffix', 'keys', 'extend'])
-      opts.parserOpts = opts.parserOpts ?? {}
-      opts.parserOpts.args = opts.parserOpts.args ?? []
-      const idx = findIndex(opts.parserOpts.args, item => {
-        return isPlainObject(item) && Object.keys(item)[0] === '_orig'
-      })
-      if (idx > -1) opts.parserOpts.args[idx] = { _orig: orig }
-      else opts.parserOpts.args.push({ _orig: orig })
-
+      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, 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
@@ -983,13 +996,13 @@ class Bajo extends Plugin {
     let ext = {}
     // default config file
     try {
-      cfg = await this.readConfig(`${path}.*`, { ignoreError: true })
+      cfg = await this.readConfig(`${path}.*`)
     } catch (err) {
       if (['BAJO_CONFIG_NO_PARSER'].includes(err.code)) throw err
     }
     // env based config file
     try {
-      ext = await this.readConfig(`${path}-${this.config.env}.*`, { ignoreError: true })
+      ext = await this.readConfig(`${path}-${this.config.env}.*`)
     } catch (err) {
       if (!['BAJO_CONFIG_FILE_NOT_FOUND'].includes(err.code)) throw err
     }

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.0",
+  "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,14 @@
 # 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()```
+
 ## 2026-04-23
 
 - [2.12.0] Remove ```breakNsPathFromFile()```