bajo 0.2.26 → 0.2.28

package/boot/helper/error.js

@@ -30,9 +30,9 @@ function formatErrorDetails (value, ns) {
     const val = get(v, 'context.value')
     value[i] = {
       field,
-      error: print.__(`validation.${v.type}`, v.context, { ns })
+      error: print.__(`validation.${v.type}`, v.context, { ns }),
+      value: val
     }
-    result[field] = val
   })
   return result
 }

package/boot/helper/parse-object.js

@@ -4,6 +4,8 @@ import ms from 'ms'
 import dayjs from '../lib/dayjs.js'
 import isSet from './is-set.js'
 
+const statics = ['*']
+
 function parseDur (val) {
   return isNumber(val) ? val : ms(val)
 }
@@ -22,11 +24,17 @@ function parseObject (obj, silent = true, parseValue = false) {
     else if (isArray(v)) {
       v.forEach((i, idx) => {
         if (isPlainObject(i)) obj[k][idx] = parseObject(i)
+        else if (statics.includes(i)) obj[k][idx] = i
         else if (parseValue) obj[k][idx] = dotenvParseVariables(set({}, 'item', obj[k][idx]), { assignToProcessEnv: false }).item
+        if (isArray(obj[k][idx])) obj[k][idx] = obj[k][idx].map(item => typeof item === 'string' ? item.trim() : item)
       })
     } else if (isSet(v)) {
       try {
-        if (parseValue) obj[k] = dotenvParseVariables(set({}, 'item', v), { assignToProcessEnv: false }).item
+        if (statics.includes(v)) obj[k] = v
+        else if (parseValue) {
+          obj[k] = dotenvParseVariables(set({}, 'item', v), { assignToProcessEnv: false }).item
+          if (isArray(obj[k])) obj[k] = obj[k].map(item => typeof item === 'string' ? item.trim() : item)
+        }
         if (k.slice(-3) === 'Dur') obj[k] = parseDur(v)
         if (k.slice(-2) === 'Dt') obj[k] = parseDt(v)
       } catch (err) {

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.26",
+  "version": "0.2.28",
   "description": "A framework to build a giant monstrous app rapidly",
   "main": "boot/index.js",
   "scripts": {