bajo 2.6.2 → 2.7.2

package/class/bajo.js

@@ -225,8 +225,7 @@ class Bajo extends Plugin {
    * @returns {Object[]} The collection
    */
   buildCollections = async (options = {}) => {
-    let { ns, handler, dupChecks = [], container, useDefaultName } = options
-    useDefaultName = useDefaultName ?? true
+    let { ns, handler, dupChecks = [], container, useDefaultName = true, noDefault = true } = options
     if (!ns) ns = this.ns
     const cfg = this.app[ns].getConfig()
     let items = get(cfg, container, [])
@@ -269,6 +268,8 @@ class Bajo extends Plugin {
       }
     }
 
+    if (!noDefault && !items.find(item => item.name === 'default')) this.app[ns].fatal('missing%s%s', 'default', container)
+
     /**
      * Run after collection is built
      *

package/class/base.js

@@ -38,7 +38,7 @@ class Base extends Plugin {
    */
   loadConfig = async () => {
     const { defaultsDeep } = this.app.lib.aneka
-    const { get, keys, pick, isEmpty } = this.app.lib._
+    const { get, keys, pick, isEmpty, upperFirst } = this.app.lib._
     const { log, getModuleDir, readAllConfigs } = this.app.bajo
     const { parseObject } = this.app.lib
 
@@ -60,8 +60,7 @@ class Base extends Plugin {
     } catch (err) {}
     const cfgEnv = get(this, `app.env.${this.ns}`, {})
     const cfgArgv = get(this, `app.argv.${this.ns}`, {})
-    const envArgv = defaultsDeep({}, cfgEnv, cfgArgv)
-    cfg = pick(defaultsDeep({}, envArgv ?? {}, cfg ?? {}, this.config ?? {}), defKeys)
+    cfg = pick(defaultsDeep({}, cfgEnv ?? {}, cfgArgv ?? {}, cfg ?? {}, this[`config${upperFirst(this.app.bajo.config.env)}`] ?? {}, this.config ?? {}), defKeys)
     this.config = parseObject(cfg, { parseValue: true })
   }
 

package/class/helper/bajo.js

@@ -10,9 +10,6 @@ import {
   collectHooks,
   run
 } from './base.js'
-import aneka from 'aneka'
-
-const { currentLoc, resolvePath } = aneka
 
 const {
   orderBy,
@@ -108,7 +105,7 @@ export default factory
  */
 export async function buildBaseConfig () {
   // dirs
-  const { defaultsDeep } = this.app.lib.aneka
+  const { defaultsDeep, textToArray, currentLoc, resolvePath } = this.app.lib.aneka
   this.config = defaultsDeep({}, this.app.envVars._, this.app.argv._)
   set(this, 'dir.base', this.app.dir)
   const path = currentLoc(import.meta).dir + '/../..'
@@ -130,12 +127,7 @@ export async function buildBaseConfig () {
     if (isEmpty(pluginPkgs)) {
       const pluginsFile = `${this.dir.data}/config/.plugins`
       if (fs.existsSync(pluginsFile)) {
-        let lines = fs.readFileSync(pluginsFile, 'utf8')
-        lines = lines.trim().split('\n').map(p => p.trim())
-        pluginPkgs = lines.filter(c => {
-          const line = c.split('#')[0].trim()
-          return !isEmpty(line)
-        })
+        pluginPkgs = textToArray(fs.readFileSync(pluginsFile, 'utf8'))
       }
     }
   }
@@ -153,6 +145,7 @@ export async function buildBaseConfig () {
  * @async
  */
 export async function buildPlugins () {
+  const { resolvePath } = this.app.lib.aneka
   this.log.trace('buildPluginsStart')
   for (const pkg of this.app.pluginPkgs) {
     const ns = camelCase(pkg)

package/class/plugin.js

@@ -170,6 +170,7 @@ class Plugin {
    * @param {string[]} names - Method's names
    */
   selfBind (names) {
+    if (!Array.isArray(names)) names = [names]
     for (const name of names) {
       this[name] = this[name].bind(this)
     }

package/extend/bajo/intl/en-US.json

@@ -180,5 +180,7 @@
   "method": "Method",
   "exist%s%s": "%s|upperFirst '%s' exists already",
   "fieldError%s%s": "'%s': %s|lowerFirst",
-  "reservedName%s%s": "%s|upperFirst name '%s' is a reserved name. Please rename to something else"
+  "reservedName%s%s": "%s|upperFirst name '%s' is a reserved name. Please rename to something else",
+  "missing%s%s": "Missing '%s' %s",
+  "processing...": "Processing..."
 }

package/extend/bajo/intl/id.json

@@ -180,5 +180,7 @@
   "method": "Metode",
   "exist%s%s": "%s|upperFirst '%s' sudah ada",
   "fieldError%s%s": "'%s': %s|lowerFirst",
-  "reservedName%s%s": "Nama %s|lowerFirst '%s' adalah nama tang di reserve. Silahkan gunakan nama lainnya"
+  "reservedName%s%s": "Nama %s|lowerFirst '%s' adalah nama tang di reserve. Silahkan gunakan nama lainnya",
+  "missing%s%s": "%s|upperFirst '%s' tidak ditemukan",
+  "processing...": "Memroses..."
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "2.6.2",
+  "version": "2.7.2",
   "description": "The ultimate framework for whipping up massive apps in no time",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,7 @@
   "homepage": "https://github.com/ardhi/bajo#readme",
   "dependencies": {
     "add-filename-increment": "^1.0.0",
-    "aneka": "^0.12.0",
+    "aneka": "^0.13.1",
     "chalk": "^5.6.0",
     "dayjs": "^1.11.13",
     "deep-freeze-strict": "^1.1.1",

package/wiki/CHANGES.md

@@ -1,5 +1,19 @@
 # Changes
 
+## 2026-03-11
+
+- [2.7.2] Bug fix in env dependent config building
+- [2.7.2] ```selfBind()``` now also accept string for single method
+
+## 2026-03-10
+
+- [2.7.1] Using ```textToArray()``` from ```aneka``` instead of custom function to parse text into array
+
+## 2026-03-02
+
+- [2.7.0] Add ```useDefaultName``` parameter to ```buildCollection()```
+- [2.7.0] Add some translations
+
 ## 2026-02-26
 
 - [2.6.2] Bug fix on ```getMethod()```