bajo 0.2.25 → 0.2.27

package/boot/helper/error.js

@@ -1,4 +1,4 @@
-import { last, isPlainObject, each, isArray, get } from 'lodash-es'
+import { last, isPlainObject, each, isArray, get, isEmpty, merge } from 'lodash-es'
 import getPluginName from './get-plugin-name.js'
 
 /**
@@ -18,6 +18,7 @@ Error.stackTraceLimit = 15
 
 function formatErrorDetails (value, ns) {
   const { print } = this.bajo.helper
+  const result = {}
   each(value, (v, i) => {
     if (!v.context) {
       v.error = print.__(v.error, { ns })
@@ -25,11 +26,15 @@ function formatErrorDetails (value, ns) {
     }
     v.context.message = v.message
     if (v.type === 'any.only') v.context.ref = print.__(`field.${get(v, 'context.valids.0.key')}`, { ns })
+    const field = get(v, 'context.key')
+    const val = get(v, 'context.value')
     value[i] = {
-      field: get(v, 'context.key'),
+      field,
       error: print.__(`validation.${v.type}`, v.context, { ns })
     }
+    result[field] = val
   })
+  return result
 }
 
 function error (msg = 'Internal server error', ...args) {
@@ -55,13 +60,16 @@ function error (msg = 'Internal server error', ...args) {
   if (isPlainObject(payload)) {
     delete payload.class
     delete payload.ns
+    const values = {}
     for (const key in payload) {
       const value = payload[key]
       if (key === 'details' && isArray(value) && orgMsg === 'Validation Error') {
-        formatErrorDetails.call(this, value, ns)
+        const result = formatErrorDetails.call(this, value, ns)
+        if (result) merge(values, result)
       }
       err[key] = value
     }
+    if (!isEmpty(values)) err.values = values
   }
   return err
 }

package/boot/lib/print.js

@@ -31,12 +31,12 @@ export class Print {
   }
 
   setText (text, ...args) {
-    // const { dayjs } = this.scope.bajo.helper
+    const { dayjs } = this.scope.bajo.helper
     text = this.__(text, ...args)
     this.setOpts(args)
     const prefixes = []
     const texts = []
-    // if (this.opts.showDatetime) prefixes.push('[' + dayjs().toISOString() + ']')
+    if (this.opts.showDatetime) prefixes.push('[' + dayjs().toISOString() + ']')
     if (this.opts.showCounter) texts.push('[' + this.getElapsed() + ']')
     if (prefixes.length > 0) this.ora.prefixText = this.ora.prefixText + prefixes.join(' ')
     if (texts.length > 0) text = texts.join(' ') + ' ' + text

package/boot/run-tool.js

@@ -1,4 +1,5 @@
 import { isString, map, find } from 'lodash-es'
+import Path from 'path'
 const tools = []
 
 async function runTool () {
@@ -27,8 +28,14 @@ async function runTool () {
   if (!tool) print.fatal('Sidetool \'%s\' not found. Aborted!', name)
   const opts = { ns, toc, path, params, args: config.args }
   const mod = await importModule(tool.file)
-  const handler = mod.handler ?? mod
-  await handler.call(this, opts)
+  if (mod === 'defCliHandler' && this.bajoCli) {
+    const { runToolMethod } = this.bajoCli.helper
+    const dir = `${Path.dirname(tool.file)}/tool`
+    await runToolMethod({ path, args: config.args, dir })
+  } else {
+    const handler = mod.handler ?? mod
+    await handler.call(this, opts)
+  }
 }
 
 export default runTool

package/package.json

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