bajo 0.2.5 → 0.2.7

package/boot/helper/generate-id.js

@@ -1,20 +1,19 @@
-import { cloneDeep, isPlainObject } from 'lodash-es'
 import { customAlphabet } from 'nanoid'
 
 const generateId = (options = {}) => {
-  let { pattern, length = 21, returnInstance } = options
-  let opts = {}
-  if (isPlainObject(pattern)) {
-    opts = cloneDeep(pattern)
-    returnInstance = opts.returnInstance
-    length = opts.length
-    pattern = opts.pattern
+  let type
+  if (options === 'int') {
+    type = options
+    options = { pattern: '0123456789', length: 15 }
   }
+  let { pattern, length = 13, returnInstance } = options
   pattern = pattern ?? 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
-  if (opts.lowerCase) pattern = pattern.toLowerCase()
-  else if (opts.upperCase) pattern = pattern.toUpperCase()
+  if (options.case === 'lower') pattern = pattern.toLowerCase()
+  else if (options.case === 'upper') pattern = pattern.toUpperCase()
   const nid = customAlphabet(pattern, length)
-  return returnInstance ? nid : nid()
+  if (returnInstance) return nid
+  const value = nid()
+  return type === 'int' ? parseInt(value) : value
 }
 
 export default generateId

package/boot/helper/sec-to-hms.js

@@ -0,0 +1,15 @@
+// taken from: https://stackoverflow.com/questions/1322732/convert-seconds-to-hh-mm-ss-with-javascript
+
+function secToHms (secs) {
+  const secNum = parseInt(secs, 10)
+  const hours = Math.floor(secNum / 3600)
+  const minutes = Math.floor(secNum / 60) % 60
+  const seconds = secNum % 60
+
+  return [hours, minutes, seconds]
+    .map(v => v < 10 ? '0' + v : v)
+    .filter((v, i) => v !== '00' || i > 0)
+    .join(':')
+}
+
+export default secToHms

package/boot/lib/bora.js

@@ -13,11 +13,13 @@ class Bora {
     this.opts = opts
     this.ora = ora(this.opts)
     this.args = args
+    this.startTime = null
   }
 
   setScope (scope) {
     this.scope = scope
-    const { getConfig } = this.scope.bajo.helper
+    const { getConfig, dayjs } = this.scope.bajo.helper
+    this.startTime = dayjs()
     const config = getConfig()
     let silent = !!config.silent
     if (this.opts.skipSilent) silent = false
@@ -27,12 +29,15 @@ class Bora {
   }
 
   setText (text, ...args) {
+    const { dayjs, secToHms } = this.scope.bajo.helper
     if (isString(text)) {
       const i18n = get(this, 'scope.bajoI18N.instance')
       if (i18n) {
         if (isPlainObject(args[0])) text = i18n.t(text, args[0])
         else text = i18n.t(text, { ns: this.ns, postProcess: 'sprintf', sprintf: args })
       } else text = sprintf(text, ...args)
+      const elapsed = dayjs().diff(this.startTime, 'second')
+      if (this.opts.showCounter) text = `[${secToHms(elapsed)}] ${text}`
       this.ora.text = text
     }
     return this

package/boot/lib/build-helper.js

@@ -1,5 +1,5 @@
 import fastGlob from 'fast-glob'
-import { map, without, camelCase, isFunction, isPlainObject, forOwn } from 'lodash-es'
+import { camelCase, isFunction, isPlainObject, forOwn } from 'lodash-es'
 import resolvePath from '../helper/resolve-path.js'
 import importModule from '../helper/import-module.js'
 
@@ -30,11 +30,9 @@ const wrapAsyncFn = function (name, handler, bind) {
   }
 }
 
-export default async function (dir, { pkg = 'bajo', exclude = [] } = {}) {
+export default async function (dir, pkg = 'bajo') {
   dir = resolvePath(dir)
-  exclude = map(exclude, e => `${dir}/${e}`)
-  let files = await fastGlob(`${dir}/**/*.js`)
-  files = without(files, ...exclude)
+  const files = await fastGlob([`!${dir}/**/_*.js`, `${dir}/**/*.js`])
   const helper = {}
   for (const f of files) {
     const base = f.replace(dir, '').replace('.js', '')

package/boot/lib/parse-args-argv.js

@@ -6,6 +6,7 @@ import dotenvParseVariables from 'dotenv-parse-variables'
 import importModule from '../helper/import-module.js'
 import { find, each, set, camelCase, forOwn } from 'lodash-es'
 import fs from 'fs-extra'
+import path from 'path'
 import currentLoc from '../helper/current-loc.js'
 
 const { unflatten } = flat
@@ -14,7 +15,7 @@ const parseItem = (data, delimiter) => {
   return unflatten(data, {
     delimiter,
     safe: true,
-    overwrite: true,
+    overwrite: true
   })
 }
 
@@ -28,10 +29,8 @@ const parseWithParser = async () => {
 
 const parseWithYargs = async () => {
   const parser = './app/bajo/argv-parser.js'
-  if (fs.existsSync(parser)) {
-    const mod = await importModule(parser)
-    return await mod(yargs)
-  }
+  const mod = await importModule(parser)
+  if (mod) return await mod(yargs)
   const pkg = fs.readJSONSync(`${currentLoc(import.meta).dir}/../../package.json`)
   let name = `node ${pkg.main}`
   if (pkg.bin) name = path.basename(pkg.bin, '.js')
@@ -47,7 +46,7 @@ const parseWithYargs = async () => {
     .version().alias('version', 'v')
     .help().alias('help', 'h')
     .alias('tool', 't')
-    if (pkg.homepage) cli.epilog(`For more information please visit ${pkg.homepage}`)
+  if (pkg.homepage) cli.epilog(`For more information please visit ${pkg.homepage}`)
   return cli.argv
 }
 

package/boot/plugins/attach-helper.js

@@ -4,7 +4,7 @@ import { keys } from 'lodash-es'
 async function runner (plugin, pkg) {
   const { log, freeze } = this.bajo.helper
   const dir = pkg === 'app' ? (this.bajo.config.dir.base + '/app') : this.bajo.helper.getModuleDir(pkg)
-  this[plugin].helper = await buildHelper.call(this, `${dir}/bajo/helper`, { pkg })
+  this[plugin].helper = await buildHelper.call(this, `${dir}/bajo/helper`, pkg)
   freeze(this[plugin].helper, true)
   log.trace('Attach helper: %s (%d)', plugin, keys(this[plugin].helper).length)
 }

package/boot/plugins/collect-config-handlers.js

@@ -1,5 +1,4 @@
 import { isFunction, isPlainObject, map } from 'lodash-es'
-import fs from 'fs-extra'
 
 async function collectConfigHandlers (pkg) {
   const { getModuleDir, importModule, log } = this.bajo.helper
@@ -10,13 +9,11 @@ async function collectConfigHandlers (pkg) {
     } catch (err) {}
     if (!dir) continue
     const file = `${dir}/bajo/extend/read-config.js`
-    if (!fs.existsSync(file)) continue
-    try {
-      let mod = await importModule(file)
-      if (isFunction(mod)) mod = await mod.call(this)
-      if (isPlainObject(mod)) mod = [mod]
-      this.bajo.configHandlers.concat(mod)
-    } catch (err) {}
+    let mod = await importModule(file)
+    if (!mod) continue
+    if (isFunction(mod)) mod = await mod.call(this)
+    if (isPlainObject(mod)) mod = [mod]
+    this.bajo.configHandlers.concat(mod)
   }
   const exts = map(this.bajo.configHandlers, 'ext')
   log.trace('Config handlers: %s', exts.join(', '))

package/boot/plugins/collect-exit-handlers.js

@@ -1,5 +1,4 @@
 import {} from 'lodash-es'
-import fs from 'fs-extra'
 
 async function collectExitHandlers () {
   const { importModule, log, eachPlugins, getConfig, print } = this.bajo.helper
@@ -9,13 +8,10 @@ async function collectExitHandlers () {
   const names = []
   await eachPlugins(async function ({ plugin, dir }) {
     const file = `${dir}/bajo/exit.js`
-    if (!fs.existsSync(file)) return undefined
-    try {
-      const mod = await importModule(file)
-      this.bajo.exitHandler[plugin] = mod
-      names.push(plugin)
-    } catch (err) {
-    }
+    const mod = await importModule(file)
+    if (!mod) return undefined
+    this.bajo.exitHandler[plugin] = mod
+    names.push(plugin)
   })
   log.trace('Exit handlers: %s', names.length === 0 ? print.__('none') : names.join(', '))
 }

package/boot/plugins/run.js

@@ -1,5 +1,4 @@
 import { get, camelCase, upperFirst, map } from 'lodash-es'
-import fs from 'fs-extra'
 
 async function run ({ singles }) {
   const { runHook, log, eachPlugins, importModule, freeze, getConfig, print } = this.bajo.helper
@@ -10,12 +9,12 @@ async function run ({ singles }) {
     await runHook(`bajo:${camelCase(`before ${f} all plugins`)}`)
     await eachPlugins(async function ({ plugin, dir }) {
       const file = `${dir}/bajo/${f}.js`
-      if (fs.existsSync(file)) {
+      const mod = await importModule(file)
+      if (mod) {
         log.debug('%s: %s', print.__(upperFirst(f)), plugin)
         await runHook(`bajo:${camelCase(`before ${f} ${plugin}`)}`)
-        const item = await importModule(file)
         const params = f === 'start' ? ['all', true] : []
-        await item.call(this, ...params)
+        await mod.call(this, ...params)
         await runHook(`bajo:${camelCase(`after ${f} ${plugin}`)}`)
       }
       if (f === 'init') freeze(this[plugin].config)

package/package.json

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