bajo 1.2.4 → 1.2.6

package/boot/class/bajo-core/build-plugins.js

@@ -2,7 +2,7 @@ import lodash from 'lodash'
 import fs from 'fs-extra'
 import resolvePath from '../../lib/resolve-path.js'
 
-const { isString, filter, map, trim, without, uniq, camelCase, isEmpty } = lodash
+const { isString, filter, map, trim, without, uniq, camelCase, isEmpty, omit } = lodash
 
 async function buildPlugins () {
   let pluginPkgs = this.config.plugins ?? []
@@ -38,7 +38,7 @@ async function buildPlugins () {
     this.pluginNames.push(plugin.name)
     this.app.addPlugin(plugin)
   }
-  delete this.config.plugins
+  this.config = omit(this.config, this.pluginNames)
 }
 
 export default buildPlugins

package/boot/class/bajo-plugin.js

@@ -13,6 +13,7 @@ class BajoPlugin extends Plugin {
 
   loadConfig = async () => {
     const { defaultsDeep } = this.lib.aneka
+    const { get } = this.lib._
     const { log, readJson, parseObject, getModuleDir } = this.app.bajo
     log.trace('- %s', this.name)
     const dir = this.name === this.app.bajo.mainNs ? (`${this.app.bajo.dir.base}/${this.app.bajo.mainNs}`) : getModuleDir(this.pkgName)
@@ -37,7 +38,9 @@ class BajoPlugin extends Plugin {
       const altCfg = await readAllConfigs.call(this.app, `${this.app.bajo.dir.data}/config/${this.name}`)
       cfg = defaultsDeep({}, omit(altCfg, omittedPluginKeys), cfg)
     } catch (err) {}
-    const envArgv = defaultsDeep({}, omit(this.app.env[this.name] ?? {}, omittedPluginKeys) ?? {}, omit(this.app.argv[this.name] ?? {}, omittedPluginKeys) ?? {})
+    const cfgEnv = omit(get(this, `app.env._.${this.name}`, {}), omittedPluginKeys) ?? {}
+    const cfgArgv = omit(get(this, `app.argv._.${this.name}`, {}), omittedPluginKeys) ?? {}
+    const envArgv = defaultsDeep({}, cfgEnv, cfgArgv)
     cfg = defaultsDeep({}, envArgv ?? {}, cfg ?? {}, this.config ?? {})
     this.title = this.title ?? cfg.title ?? this.alias
 

package/boot/class/plugin.js

@@ -46,7 +46,7 @@ class Plugin {
   }
 
   getConfig = (path, options = {}) => {
-    let obj = isEmpty(path) ? this.config : get(this.config, path, options.defValue)
+    let obj = isEmpty(path) ? this.config : get(this.config, path, options.defValue ?? {})
     options.omit = options.omit ?? omittedPluginKeys
     if (isPlainObject(obj) && !isEmpty(options.omit)) obj = omit(obj, options.omit)
     if (!options.noclone) obj = cloneDeep(obj)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "A framework to build a giant monstrous app rapidly",
   "main": "boot/index.js",
   "scripts": {