bajo 0.2.13 → 0.2.14

package/boot/attach-helper.js

@@ -1,5 +1,6 @@
 import buildHelper from './lib/build-helper.js'
 import logger from './lib/logger.js'
+import print from './lib/print.js'
 import fs from 'fs-extra'
 import dayjs from 'dayjs'
 import utc from 'dayjs/plugin/utc.js'
@@ -16,6 +17,7 @@ export default async function () {
     if (shallow) Object.freeze(o)
     else deepFreeze(o)
   }
+  this.bajo.helper.print = print.call(this)
   this.bajo.helper.log = logger.call(this)
   this.bajo.helper.dayjs = dayjs
   this.bajo.helper.setImmediate = function () {

package/boot/helper/error.js

@@ -1,5 +1,4 @@
 import { last, isPlainObject, each, isArray, get } from 'lodash-es'
-import print from './print.js'
 import getPluginName from './get-plugin-name.js'
 
 /**
@@ -18,21 +17,23 @@ import getPluginName from './get-plugin-name.js'
 Error.stackTraceLimit = 15
 
 function formatErrorDetails (value, ns) {
+  const { print } = this.bajo.helper
   each(value, (v, i) => {
     if (!v.context) {
-      v.error = print._format.call(this, ns, v.error, {})
+      v.error = print.__(v.error, { ns })
       return undefined
     }
     v.context.message = v.message
-    if (v.type === 'any.only') v.context.ref = print._format.call(this, ns, `field.${get(v, 'context.valids.0.key')}`, {})
+    if (v.type === 'any.only') v.context.ref = print.__(`field.${get(v, 'context.valids.0.key')}`, { ns })
     value[i] = {
       field: get(v, 'context.key'),
-      error: print._format.call(this, ns, `validation.${v.type}`, v.context, {})
+      error: print.__(`validation.${v.type}`, v.context, { ns })
     }
   })
 }
 
 function error (msg = 'Internal server error', ...args) {
+  const { print } = this.bajo.helper
   let payload = last(args)
   let ns
   if (isPlainObject(payload)) {
@@ -41,7 +42,7 @@ function error (msg = 'Internal server error', ...args) {
   }
   if (!ns) ns = getPluginName.call(this, 3)
   const orgMsg = msg
-  const message = print._format.call(this, ns, msg, ...args)
+  const message = print.__(msg, ...args, { ns })
   let err
   if (isPlainObject(payload) && payload.class) err = payload.class(message)
   else err = Error(message)

package/boot/lib/logger.js

@@ -1,23 +1,11 @@
-/**
- * test test
- *
- * @kind function
- * @name logger
- * @returns {Object}
- *
- */
-
-import print from '../helper/print.js'
 import os from 'os'
-import { keys, each, isEmpty, without, merge, upperFirst, isString } from 'lodash-es'
+import { isEmpty, without, merge, upperFirst, isPlainObject } from 'lodash-es'
 // import pretty from 'prettyjson'
 import getPluginName from '../helper/get-plugin-name.js'
 import levels from '../helper/log-levels.js'
 import isLogInRange from '../helper/is-log-in-range.js'
 import dayjs from 'dayjs'
 
-const levelList = keys(levels)
-
 /*
 const prettyOpts = {
   noAlign: true,
@@ -26,50 +14,64 @@ const prettyOpts = {
 }
 */
 
-export default function logger () {
-  const config = this.bajo.config
-  // const format = config.log.dateFormat
-  const format = 'YYYY-MM-DDTHH:MM:ss.SSS[Z]'
-  const log = {}
-  const self = this
-  log.child = () => {
-    if (!config.log.logger) config.log.logger = 'bajoLogger'
-    if (self[config.log.logger] && self[config.log.logger].logger) return self[config.log.logger].logger.child()
-    return self
+class Log {
+  constructor (scope) {
+    this.scope = scope
+    this.config = scope.bajo.config
+    this.bajoLog = this.config.log.logger ?? 'bajoLogger'
+    this.format = 'YYYY-MM-DDTHH:MM:ss.SSS[Z]'
   }
-  each(levelList, l => {
-    log[l] = (...params) => {
-      const config = this.bajo.config
-      if (config.log.level === 'silent') return
-      if (!isLogInRange.call(this, l)) return
-      let [data, msg, ...args] = params
-      if (isString(data)) {
-        args.unshift(msg)
-        msg = data
-        data = null
-      }
-      args = without(args, undefined)
-      const pkg = getPluginName.call(this)
-      msg = print._format(pkg, `[%s] ${msg}`, pkg, ...args)
-      const bajoLog = config.log.logger ?? 'bajoLogger'
-      if (this[bajoLog] && this[bajoLog].logger) {
-        this[bajoLog].logger[l](data, msg, ...args)
+
+  isExtLogger () {
+    return this.scope[this.bajoLog] && this.scope[this.bajoLog].logger
+  }
+
+  child () {
+    if (this.isExtLogger()) return this.scope[this.bajoLog].logger.child()
+    return this.scope
+  }
+
+  formatMsg (level, params) {
+    const { print } = this.scope.bajo.helper
+    let opts = {}
+    if (isPlainObject(params.slice(-1)[0])) opts = params.pop()
+    if (this.config.log.level === 'silent') return
+    if (!isLogInRange.call(this.scope, level)) return
+    let [data, msg, ...args] = params
+    if (typeof data === 'string') {
+      args.unshift(msg)
+      msg = data
+      data = null
+    }
+    args = without(args, undefined)
+    const pkg = opts.pkg ?? getPluginName.call(this.scope, 3)
+    msg = print.__(`[%s] ${msg}`, pkg, ...args)
+    if (this.scope[this.bajoLog] && this.scope[this.bajoLog].logger) {
+      this.scope[this.bajoLog].logger[level](data, msg, ...args)
+    } else {
+      let text
+      const dt = new Date()
+      if (this.config.env === 'prod') {
+        const json = { level: levels[level], time: dt.valueOf(), pid: process.pid, hostname: os.hostname() }
+        if (!isEmpty(data)) merge(json, data)
+        merge(json, { msg })
+        text = JSON.stringify(json)
       } else {
-        let text
-        const dt = new Date()
-        if (config.env === 'prod') {
-          const json = { level: levels[l], time: dt.valueOf(), pid: process.pid, hostname: os.hostname() }
-          if (!isEmpty(data)) merge(json, data)
-          merge(json, { msg })
-          text = JSON.stringify(json)
-        } else {
-          text = `[${dayjs(dt).utc(true).format(format)}] ${upperFirst(l)}: ${msg}`
-          // if (!isEmpty(data)) text += '\n  ' + (pretty.render(data, prettyOpts).split('\n').join('\n  '))
-          if (!isEmpty(data)) text += '\n' + JSON.stringify(data)
-        }
-        console.log(text)
+        text = `[${dayjs(dt).utc(true).format(this.format)}] ${upperFirst(level)}: ${msg}`
+        // if (!isEmpty(data)) text += '\n  ' + (pretty.render(data, prettyOpts).split('\n').join('\n  '))
+        if (!isEmpty(data)) text += '\n' + JSON.stringify(data)
       }
+      console.log(text)
     }
-  })
-  return log
+  }
+}
+
+Object.keys(levels).forEach(level => {
+  Log.prototype[level] = function (...params) {
+    this.formatMsg(level, params)
+  }
+})
+
+export default function logger () {
+  return new Log(this)
 }

package/boot/lib/print.js

@@ -0,0 +1,82 @@
+import bora from './bora.js'
+import Sprintf from 'sprintf-js'
+import { isPlainObject, get, isEmpty } from 'lodash-es'
+import defaultsDeep from '../helper/defaults-deep.js'
+import getPluginName from '../helper/get-plugin-name.js'
+
+const { sprintf } = Sprintf
+
+class Print {
+  constructor (scope) {
+    this.scope = scope
+  }
+
+  _prep (params) {
+    const [msg, ...args] = params
+    let opts = {}
+    if (isPlainObject(args.slice(-1)[0])) opts = args.pop()
+    opts = defaultsDeep(opts, { type: 'bora', exit: false, skipSilent: false })
+    this.opts = opts
+    this.opts.ns = this.opts.ns ?? ['bajoI18N']
+    this.opts.pkg = this.opts.pkg ?? getPluginName.call(this.scope, 2)
+    this.args = args
+    this.msg = msg
+  }
+
+  formatMsg (params) {
+    this._prep(params)
+    if (isEmpty(this.msg)) return ''
+    const transHandler = get(this, 'scope.bajo.transHandler')
+    const dayjs = get(this, 'scope.bajo.helper')
+    if (transHandler) this.msg = transHandler.call(this, { msg: this.msg, params: this.args, options: this.opts })
+    else this.msg = sprintf(this.msg, ...this.args)
+    if (this.opts.showDatetime && dayjs) this.msg = `[${dayjs().toISOString()}] ${this.msg}`
+    return this.msg
+  }
+
+  __ (...params) {
+    return this.formatMsg(params)
+  }
+
+  output (params, boraMethod = 'succeed', logMethod = 'info', consoleMethod = 'log') {
+    this.formatMsg(params)
+    if (isEmpty(this.msg)) return ''
+    switch (this.opts.type) {
+      case 'bora': bora.call(this.scope, this.opts.ns, this.opts)[boraMethod](this.msg, ...this.args); break
+      case 'log': this.scope.bajo.helper.log[logMethod](this.msg, ...this.args, this.opts); break
+      default: console[consoleMethod](this.msg)
+    }
+    if (this.opts.exit) process.exit()
+  }
+
+  fail (...params) {
+    this.output(params, 'fail', 'error', 'error')
+  }
+
+  succeed (...params) {
+    this.output(params, 'succeed', 'info')
+  }
+
+  warn (...params) {
+    this.output(params, 'warn', 'warn')
+  }
+
+  info (...params) {
+    this.output(params, 'info')
+  }
+
+  fatal (...params) {
+    this.output(params, 'fatal', 'error', 'error')
+    process.exit(1)
+  }
+
+  bora (...params) {
+    let ns = getPluginName.call(this.scope, 2)
+    if (ns === 'bajo') ns = 'bajoI18N'
+    return bora.call(this.scope, ns, ...params)
+  }
+}
+
+export default function () {
+  return new Print(this)
+}

package/boot/plugins/run.js

@@ -1,4 +1,4 @@
-import { get, camelCase, upperFirst, map } from 'lodash-es'
+import { set, get, camelCase, upperFirst, map } from 'lodash-es'
 
 async function run ({ singles }) {
   const { runHook, log, eachPlugins, importModule, freeze, getConfig, print } = this.bajo.helper
@@ -18,6 +18,7 @@ async function run ({ singles }) {
         await runHook(`bajo:${camelCase(`after ${f} ${plugin}`)}`)
       }
       if (f === 'init') freeze(this[plugin].config)
+      set(this, `${plugin}.state.${f}`, true)
     })
     await runHook(`bajo:${camelCase(`after ${f} all plugins`)}`)
   }

package/package.json

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

package/boot/helper/print.js

@@ -1,102 +0,0 @@
-import bora from '../lib/bora.js'
-import Sprintf from 'sprintf-js'
-import { last, isPlainObject, get, merge, upperFirst } from 'lodash-es'
-import defaultsDeep from './defaults-deep.js'
-import getPluginName from './get-plugin-name.js'
-
-const { sprintf } = Sprintf
-
-function prep (args) {
-  let opts = { type: 'bora', exit: false, skipSilent: false }
-  const l = last(args)
-  if (isPlainObject(l)) opts = defaultsDeep(args.pop(), opts)
-  const [pkg, msg, ...params] = args
-  opts.pkg = pkg
-  opts.ns = pkg === 'bajo' ? 'bajoI18N' : pkg
-  return { ns: opts.ns, pkg, msg, params, opts }
-}
-
-function format (...args) {
-  const { ns, msg, params, opts } = prep(args)
-  if (!msg) return ''
-  const i18n = get(this, 'bajoI18N.instance')
-  const dayjs = get(this, 'bajo.helper')
-  if (i18n) {
-    if (isPlainObject(params[0])) {
-      const ctx = merge({}, params[0] ?? {}, { ns })
-      if (msg.startsWith('validation') && ctx.message && !i18n.exists(msg, { ns })) {
-        const message = ctx.message
-          .replace(/".*?" /, '')
-          .replace(/^is /, '')
-        return upperFirst(message)
-      }
-      if (msg === 'field.username') console.log(ctx)
-      return i18n.t(msg, ctx)
-    }
-    return i18n.t(msg, { ns, pkg: opts.pkg, postProcess: 'sprintf', sprintf: params })
-  }
-  let text = sprintf(msg, ...params)
-  if (opts.showDatetime && dayjs) text = `[${dayjs().toISOString()}] ${text}`
-  return text
-}
-
-const print = {
-  __: function (...args) {
-    const [msg, ...params] = args
-    const pkg = getPluginName.call(this, 2)
-    return format.call(this, pkg, msg, ...params)
-  },
-  _format: format,
-  fail: function (...args) {
-    args.unshift(getPluginName.call(this, 2))
-    const { ns, opts, msg, params } = prep(args)
-    if (msg) {
-      if (opts.type === 'bora') bora.call(this, ns, opts).fail(msg, ...params)
-      else console.error(format.call(this, ns, msg, ...params))
-    }
-    if (opts.exit) process.exit(1)
-  },
-  succeed: function (...args) {
-    args.unshift(getPluginName.call(this, 2))
-    const { ns, opts, msg, params } = prep(args)
-    if (msg) {
-      if (opts.type === 'bora') bora.call(this, ns, opts).succeed(msg, ...params)
-      else console.log(format.call(this, ns, msg, ...params))
-    }
-    if (opts.exit) process.exit(0)
-  },
-  warn: function (...args) {
-    args.unshift(getPluginName.call(this, 2))
-    const { ns, opts, msg, params } = prep(args)
-    if (msg) {
-      if (opts.type === 'bora') bora.call(this, ns, opts).warn(msg, ...params)
-      else console.log(format.call(this, ns, msg, ...params))
-    }
-    if (opts.exit) process.exit(0)
-  },
-  info: function (...args) {
-    args.unshift(getPluginName.call(this, 2))
-    const { ns, opts, msg, params } = prep(args)
-    if (msg) {
-      if (opts.type === 'bora') bora.call(this, ns, opts).info(msg, ...params)
-      else console.log(format.call(this, ns, msg, ...params))
-    }
-    if (opts.exit) process.exit(0)
-  },
-  fatal: function (...args) {
-    args.unshift(getPluginName.call(this, 2))
-    const { ns, opts, msg, params } = prep(args)
-    if (msg) {
-      if (opts.type === 'bora') bora.call(this, ns, opts).fatal(msg, ...params)
-      else console.error(format.call(this, ns, msg, ...params))
-    }
-    process.exit(1)
-  },
-  bora: function (...args) {
-    let ns = getPluginName.call(this, 2)
-    if (ns === 'bajo') ns = 'bajoI18N'
-    return bora.call(this, ns, ...args)
-  }
-}
-
-export default print