bajo 0.2.11 → 0.2.13

package/boot/helper/build-name.js

@@ -0,0 +1,17 @@
+import path from 'path'
+import { isString, isFunction, keys, camelCase, kebabCase, snakeCase } from 'lodash-es'
+import pascalCase from './pascal-case.js'
+const converter = { camelCase, kebabCase, snakeCase, pascalCase }
+
+function buildName (file, options = {}) {
+  if (isString(options)) options = { base: options }
+  if (!options.base) options.base = path.dirname(file)
+  if (!keys(converter).includes(options.converter)) options.converter = 'camelCase'
+  let name = file.replace(options.base, '')
+  name = name.slice(0, name.indexOf(path.extname(name)))
+  if (isFunction(options.converter)) name = options.converter.call(this, name)
+  else name = converter[options.converter](name)
+  return name
+}
+
+export default buildName

package/boot/helper/each-plugins.js

@@ -80,6 +80,7 @@ async function _eachPlugins (handler, { key = 'name', glob, ns, useBajo } = {})
 
 async function eachPlugins (handler, options = {}) {
   const { getConfig, getPluginName } = this.bajo.helper
+  if (typeof options === 'string') options = { glob: options }
   let { key = 'name', glob, ns, extend, extendHandler, useBajo } = options
   if (!extendHandler) extendHandler = handler
   ns = ns ?? getPluginName(4)

package/boot/helper/get-helper.js

@@ -3,7 +3,7 @@ import error from './error.js'
 import breakNsPath from './break-ns-path.js'
 
 function getHelper (name = '', thrown = true) {
-  const [plugin, method] = breakNsPath(name)
+  const [plugin, method] = breakNsPath.call(this, name)
   const helper = get(this, `${plugin}.helper.${method}`)
   if (helper) return helper
   if (thrown) throw error.call(this, 'Can\'t find helper named \'%s\'', name)

package/boot/helper/print.js

@@ -90,7 +90,7 @@ const print = {
       if (opts.type === 'bora') bora.call(this, ns, opts).fatal(msg, ...params)
       else console.error(format.call(this, ns, msg, ...params))
     }
-    process.exit(0)
+    process.exit(1)
   },
   bora: function (...args) {
     let ns = getPluginName.call(this, 2)

package/boot/lib/bora.js

@@ -29,7 +29,7 @@ class Bora {
   }
 
   setText (text, ...args) {
-    const { dayjs, secToHms } = this.scope.bajo.helper
+    const { dayjs } = this.scope.bajo.helper
     if (isString(text)) {
       const i18n = get(this, 'scope.bajoI18N.instance')
       if (i18n) {
@@ -38,16 +38,22 @@ class Bora {
       } else text = sprintf(text, ...args)
       let opts = last(args)
       if (!isPlainObject(opts)) opts = {}
-      const elapsed = dayjs().diff(this.startTime, 'second')
       const texts = []
       if (this.opts.showDatetime || opts.showDatetime) texts.push('[' + dayjs().toISOString() + ']')
-      if (this.opts.showCounter || opts.showCounter) texts.push('[' + secToHms(elapsed) + ']')
+      if (this.opts.showCounter || opts.showCounter) texts.push('[' + this.getElapsed() + ']')
       texts.push(text)
       this.ora.text = texts.join(' ')
     }
     return this
   }
 
+  getElapsed (unit = 'hms') {
+    const { dayjs, secToHms } = this.scope.bajo.helper
+    const u = unit === 'hms' ? 'second' : unit
+    const elapsed = dayjs().diff(this.startTime, u)
+    return unit === 'hms' ? secToHms(elapsed) : elapsed
+  }
+
   start (text, ...args) {
     this.setText(text, ...args)
     this.ora.start()

package/boot/run-tool.js

@@ -4,14 +4,14 @@ const tools = []
 async function runTool () {
   const { getConfig, log, eachPlugins, importPkg, importModule, print } = this.bajo.helper
   const config = getConfig()
-  if (!config.tool) return
-  log.debug('Run tool')
-  print.info('Sidetool is running...')
-
   await eachPlugins(async function checkCli ({ file, plugin, alias }) {
     tools.push({ ns: plugin, file, nsAlias: alias })
   }, { glob: 'tool.js', ns: 'bajoCli' })
-  if (tools.length === 0) print.fatal('No tool loaded. Aborted!')
+  this.bajo.tools = tools
+  if (!config.tool) return
+  log.debug('Run tool')
+  print.info('Sidetool is running...')
+  if (tools.length === 0) print.fatal('No tool found. Aborted!')
   let name = config.tool
   let toc = false
   if (!isString(config.tool)) {

package/package.json

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