bajo 2.13.1 → 2.14.1

package/class/bajo.js

@@ -850,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 ?? {}
@@ -864,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)
@@ -882,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/class/helper/bajo.js

@@ -106,7 +106,7 @@ export default factory
 export async function buildBaseConfig () {
   // dirs
   const { defaultsDeep, textToArray, currentLoc, resolvePath } = this.app.lib.aneka
-  this.config = defaultsDeep({}, this.app.envVars._, this.app.argv._)
+  this.config = defaultsDeep({}, this.app.argv._, this.app.envVars._)
   set(this, 'dir.base', this.app.dir)
   const path = currentLoc(import.meta).dir + '/../..'
   set(this, 'dir.pkg', resolvePath(path))

package/class/helper/base.js

@@ -100,17 +100,20 @@ export async function checkDependencies () {
  */
 export async function collectHooks () {
   const { eachPlugins, runHook, isLogInRange, importModule } = this.bajo
-  const me = this
+  const me = this // "this" is "app"
   me.bajo.log.trace('collecting%s', this.t('hooks'))
-  // collects
   await eachPlugins(async function ({ dir, file }) {
-    const _file = file.replace(dir + '/hook/', '').replace('.js', '')
-    const [names, path] = _file.split('@')
-    const [ns, subNs] = names.split('.').map(n => camelCase(n))
     const mod = await importModule(file, { asHandler: true })
     if (!mod) return undefined
-    merge(mod, { ns, subNs, path: camelCase(path), src: this.ns })
-    me.bajo.hooks.push(mod)
+    const _file = file.replace(dir + '/hook/', '').replace('.js', '')
+    let [names, path] = _file.split('@')
+    names = names.split('$').map(n => trim(n))
+    for (const name of names) {
+      let [ns, subNs, subSubNs] = name.split('.').map(n => camelCase(n))
+      if (subSubNs) subNs = `${subNs}.${subSubNs}`
+      const m = merge({}, mod, { ns, subNs, path: camelCase(path), src: this.ns })
+      me.bajo.hooks.push(m)
+    }
   }, { glob: 'hook/**/*.js', prefix: me.bajo.ns })
   // for log trace purpose only
   if (isLogInRange('trace')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "2.13.1",
+  "version": "2.14.1",
   "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-22
+
+- [2.14.1] Bug fix in ```helper.buildBaseConfig()```
+- [2.14.1] Bug fix in ```helper.collectHooks()```
+
+## 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()```