bajo 2.4.2 → 2.6.0

package/class/app/log.js

@@ -77,16 +77,17 @@ class Log {
     if (!this.app.bajo.isLogInRange(level)) return
     const { useUtc, timeTaken, dateFormat, pretty } = this.app.bajo.config.log
     let [data, msg, ...args] = params
+    if (data instanceof Error) {
+      msg = 'error%s'
+      args = [this.getErrorMessage(data)]
+      console.error(data)
+    }
     if (typeof data === 'string') {
       args.unshift(msg)
       msg = data
       data = null
     }
     args = without(args, undefined)
-    if (data instanceof Error) {
-      msg = 'error%s'
-      args = [data.message]
-    }
     msg = this.app.t(prefix, msg, ...args)
     let text
     const dt = dayjs()
@@ -113,13 +114,17 @@ class Log {
       const tlevel = pretty ? `${chalk[logLevels[level].color](level.toUpperCase())}:` : `[${level.toUpperCase()}]`
       const tprefix = pretty ? chalk.bgBlue(`${prefix}`) : `[${prefix}]`
       text = `${tdate} ${tlevel} ${tprefix} ${msg}`
-      if (!isEmpty(data)) text += '\n' + JSON.stringify(data)
+      if (!isEmpty(data) && !(data instanceof Error)) text += '\n' + JSON.stringify(data)
     }
     console.log(text)
-    if (data instanceof Error && level === 'trace') console.error(data)
     if (this.app.bajo.config.log.save) this.save(text, prefix)
   }
 
+  getErrorMessage = error => {
+    const { isEmpty } = this.app.lib._
+    return isEmpty(error.message) ? (error.code ?? error.statusCode) : error.message
+  }
+
   /**
    * Calculate pattern used for log rotation
    *

package/class/app.js

@@ -326,27 +326,8 @@ class App {
     }
   }
 
-  /**
-   * Translate text and interpolate with given ```args```.
-   *
-   * There is a shortcut to this method attached on all plugins. You'll normally call that shorcut
-   * instead of this method, because it is bound to plugin's name already
-   *
-   * ```javascript
-   * ... within your main plugin
-   * const translated = this.app.t('main', 'My cute cat is %s', 'purring')
-   * // or
-   * const translated = this.t('My cute cat is %s', 'purring')
-   * ```
-   * @method
-   * @param {string} ns - Namespace
-   * @param {string} text - Text to translate
-   * @param  {...any} params - Arguments
-   * @returns {string}
-   */
-  t = (ns, text, ...params) => {
-    const { formatText } = this.lib.aneka
-
+  _prepTrans = (ns, text, params) => {
+    const { fallback, supported } = this.bajo.config.intl
     if (!text) {
       text = ns
       ns = 'bajo'
@@ -357,7 +338,6 @@ class App {
       params.pop()
       if (opts.lang) lang = opts.lang
     }
-    const { fallback, supported } = this.bajo.config.intl
     if (!unknownLangWarning && !supported.includes(lang)) {
       unknownLangWarning = true
       this.bajo.log.warn(`Unsupported language, fallback to '${fallback}'`)
@@ -365,7 +345,6 @@ class App {
     const plugins = reverse(without([...this.getAllNs()], ns))
     plugins.unshift(ns)
     plugins.push('bajo')
-
     let trans
     for (const p of plugins) {
       const store = get(this, `${p}.intl.${lang}`, {})
@@ -379,8 +358,46 @@ class App {
         if (trans) break
       }
     }
-    if (!trans) trans = text
-    return formatText(trans, ...params)
+    return { ns, text, lang, params, plugins, trans }
+  }
+
+  /**
+   * Translate text and interpolate with given ```args```.
+   *
+   * There is a shortcut to this method attached on all plugins. You'll normally call that shorcut
+   * instead of this method, because it is bound to plugin's name already
+   *
+   * ```javascript
+   * ... within your main plugin
+   * const translated = this.app.t('main', 'My cute cat is %s', 'purring')
+   * // or
+   * const translated = this.t('My cute cat is %s', 'purring')
+   * ```
+   * @method
+   * @param {string} ns - Namespace
+   * @param {string} text - Text to translate
+   * @param  {...any} params - Arguments
+   * @returns {string}
+   */
+  t = (ns, text, ...params) => {
+    const { formatText } = this.lib.aneka
+    let { text: newText, trans, params: args } = this._prepTrans(ns, text, params)
+    if (!trans) trans = newText
+    return formatText(trans, ...args)
+  }
+
+  /**
+   * Check whether translation text/key exists
+   *
+   * @method
+   * @param {string} ns - Namespace
+   * @param {string} text - Text to translate
+   * @returns {boolean}
+   */
+
+  te = (ns, text, ...params) => {
+    const { trans } = this._prepTrans(ns, text, params)
+    return !!trans
   }
 
   /**

package/class/helper/bajo.js

@@ -59,9 +59,9 @@ const defConfig = {
     lookupOrder: [],
     format: {
       emptyValue: '',
-      datetime: { dateStyle: 'medium', timeStyle: 'short' },
-      date: { dateStyle: 'medium' },
-      time: { timeStyle: 'short' },
+      datetime: { dateStyle: 'medium', timeStyle: 'short', timeZone: 'UTC' },
+      date: { dateStyle: 'medium', timeZone: 'UTC' },
+      time: { timeStyle: 'short', timeZone: 'UTC' },
       float: { maximumFractionDigits: 2 },
       double: { maximumFractionDigits: 5 },
       smallint: {},

package/class/plugin/err.js

@@ -97,6 +97,7 @@ class Err extends Tools {
    */
   formatErrorDetails = (value) => {
     const { isString, last } = this.app.lib._
+    const { without } = this.app.lib.aneka
     const result = {}
     const me = this
     const detailsMessage = []
@@ -104,10 +105,13 @@ class Err extends Tools {
       if (isString(v)) v = { error: v }
       if (!v.context) return undefined
       v.context.message = v.message
-      if (v.type === 'any.only') v.context.ref = get(v, 'context.valids', []).join(', ')
+      if (v.type === 'any.only') {
+        const items = without(get(v, 'context.valids', []))
+        v.context.ref = items.join(', ')
+      }
       const field = get(v, 'context.key')
       const val = get(v, 'context.value')
-      let error = me.plugin.t(`validation.${v.type}`, v.context ?? {}, {})
+      let error = me.plugin.t(v.message[0] === '~' ? v.message.slice(1) : `validation.${v.type}`, v.context ?? {}, {})
       if (error.includes(' ref:')) {
         const item = last(error.split(' '))
         const [, rfield] = item.split(':')

package/class/plugin.js

@@ -151,6 +151,19 @@ class Plugin {
     return this.app.t(this.ns, text, ...params)
   }
 
+  /**
+   * Check whether translation text/key exists.
+   *
+   * Shortcut to {@link App#te} with ns parameter set to this plugin namespace.
+   *
+   * @param {string} text - Text to translate
+   * @param  {...any} params - Variables to interpolate to ```text```
+   * @returns {string}
+   */
+  te = (text, ...params) => {
+    return this.app.te(this.ns, text, ...params)
+  }
+
   /**
    * Force bind methods to self (```this```)
    *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo",
-  "version": "2.4.2",
+  "version": "2.6.0",
   "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.11.1",
+    "aneka": "^0.12.0",
     "chalk": "^5.6.0",
     "dayjs": "^1.11.13",
     "deep-freeze-strict": "^1.1.1",

package/wiki/CHANGES.md

@@ -1,5 +1,17 @@
 # Changes
 
+## 2026-02-20
+
+- [2.6.0] Upgrade to ```aneka@0.12.0```
+- [2.6.0] Add ```te()```
+- [2.6.0] Bug fix on ```formatErrorDetails()``` in ```Err``` class
+
+## 2026-02-08
+
+- [2.5.0] Bug fix on handling log for ```error``` level
+- [2.5.0] Add ```log.getErrorMessage()``` to get the right value of error message
+- [2.5.0] Add ```timeZone``` in config for datetime data type
+
 ## 2026-01-29
 
 - [2.4.0] Hooks can now be added through ```config``` object. This is specially usefull if you provide a custom config object on app boot