bajo 2.13.0 → 2.14.0

package/class/app.js

@@ -382,8 +382,15 @@ class App {
    */
   t = (ns, text, ...params) => {
     const { formatText, isSet } = this.lib.aneka
+    const { isArray, last } = this.lib._
+    const { join } = this.bajo
     let { text: newText, trans, params: args } = this._prepTrans(ns, text, params)
     if (!isSet(trans)) trans = newText
+    const lang = isPlainObject(last(args)) ? last(args).lang : undefined
+    for (const idx in args) {
+      const arg = args[idx]
+      if (isArray(arg)) args[idx] = join(arg, { lang })
+    }
     return formatText(trans, ...args)
   }
 

package/class/bajo.js

@@ -800,12 +800,10 @@ class Bajo extends Plugin {
    * @param {string} [options.lastSeparator=and] - Text to use as the last separator
    * @returns {string}
    */
-  join = (array, options = {}) => {
-    let separator = ', '
-    let lastSeparator = 'and'
-    let lang
-    if (isString(options)) separator = options
-    else ({ separator, lastSeparator, lang } = options)
+  join = (input = [], options = {}) => {
+    const array = [...input]
+    if (isString(options)) options = { separator: options }
+    let { separator = ', ', lastSeparator = 'and', lang } = options
     const translate = (val) => {
       return this.t(val, { lang }).toLowerCase()
     }
@@ -852,7 +850,7 @@ class Bajo extends Plugin {
     const { parseObject } = this.app.lib
     const { defaultsDeep } = this.app.lib.aneka
     const { uniq, isString, isArray, findIndex, isPlainObject, merge } = this.app.lib._
-    let { ns, baseNs, extend, checkOverride, merge: merged, pattern, ignoreError = true, defValue = {}, parserOpts = {}, globOpts = {} } = options
+    let { ns, baseNs, extend, checkOverride, merge: merged, pattern, ignoreError = true, defValue = {}, parserOpts = {}, globOpts = {}, handler } = options
 
     const getParseOptsArgs = (opts, orig) => {
       opts.parserOpts = opts.parserOpts ?? {}
@@ -866,7 +864,10 @@ class Bajo extends Plugin {
 
     const output = async (obj) => {
       let orig = parseObject(obj)
-      if (!baseNs || extend === false) return orig
+      if (!baseNs || extend === false) {
+        await this.runHook('bajo:afterReadConfig', file, orig, options)
+        return orig
+      }
       const { suffix = '', keys = [] } = options
       let bases = this.app.getAllNs()
       if (isString(extend)) extend = extend.split(',').map(i => i.trim)
@@ -884,24 +885,32 @@ class Bajo extends Plugin {
       if (checkOverride) {
         getParseOptsArgs(opts, orig)
         const fileExt = `${this.app.main.dir.pkg}/extend/${baseNs}/override/${ns}${suffix}/${_path}`
+        await this.runHook('bajo.override:beforeReadConfig', fileExt, options)
         const result = parseObject(await this.readConfig(fileExt, { ...opts, extend: false, checkOverride: false, merge: false }))
+        await this.runHook('bajo.override:afterReadConfig', fileExt, result, options)
         if (!isEmpty(result)) orig = result
       }
       getParseOptsArgs(opts, orig)
       const binder = merged ? merge : defaultsDeep
       for (const base of bases) {
         if (!this.app[base]) continue
+        options.sourceNs = base
         const fileExt = `${this.app[base].dir.pkg}/extend/${baseNs}/extend/${ns}${suffix}/${_path}`
+        await this.runHook('bajo.extend:beforeReadConfig', fileExt, options)
         const result = parseObject(await this.readConfig(fileExt, { ...opts, extend: false, merge: false }))
+        await this.runHook('bajo.extend:afterReadConfig', fileExt, result, options)
         if (isEmpty(result)) continue
         if (isArray(result)) ext = [...result, ...ext]
         else ext = binder({}, result, ext)
       }
-      if (isArray(orig)) return [...orig, ...ext]
-      const item = keys.length > 0 ? pick(ext, keys) : ext
-      return binder({}, item, orig)
+      delete options.sourceNs
+      let result = isArray(orig) ? [...orig, ...ext] : binder({}, keys.length > 0 ? pick(ext, keys) : ext, orig)
+      if (handler) result = await this.callHandler(this.app[ns], handler, result)
+      await this.runHook('bajo:afterReadConfig', file, result, options)
+      return result
     }
 
+    await this.runHook('bajo:beforeReadConfig', file, options)
     parserOpts.readFromFile = true
     if (!ns) ns = this.ns
     file = resolvePath(this.getPluginFile(file))

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,19 @@
 # Changes
 
+## 2026-05-16
+
+- [2.14.0] Add ```bajo:beforeReadConfig()``` hook
+- [2.14.0] Add ```bajo.override:beforeReadConfig()``` hook
+- [2.14.0] Add ```bajo.extend:beforeReadConfig()``` hook
+- [2.14.0] Add ```bajo:afterReadConfig()``` hook
+- [2.14.0] Add ```bajo.override:afterReadConfig()``` hook
+- [2.14.0] Add ```bajo.extend:afterReadConfig()``` hook
+
+## 2026-05-02
+
+- [2.13.1] Bug fix in ```app.t()```
+- [2.13.1] Bug fix in ```bajo.join()```
+
 ## 2026-04-28
 
 - [2.13.0] Add ```options.merge``` to ```readConfig()```