sumba 0.1.11 → 0.3.0

package/bajo/helper/create-jwt-from-user-record.js

@@ -1,7 +1,7 @@
 async function createJwtFromUserRecord (rec) {
   const { importPkg, getConfig, dayjs } = this.bajo.helper
   const { hash } = this.bajoExtra.helper
-  const { get, pick } = await importPkg('lodash-es')
+  const { get, pick } = this.bajo.helper._
   const fastJwt = await importPkg('bajo-extra:fast-jwt')
   const { createSigner } = fastJwt
 

package/bajo/helper/get-user.js

@@ -1,7 +1,7 @@
 async function getUser (rec, safe = true) {
   const { getConfig, importPkg } = this.bajo.helper
   const { recordGet } = this.bajoDb.helper
-  const { omit, isString } = await importPkg('lodash-es')
+  const { omit, isString } = this.bajo.helper._
   const cfg = getConfig('sumba')
   let user
   if (isString(rec)) user = await recordGet('SumbaUser', rec, { noHook: true })

package/bajo/helper/has-column.js

@@ -1,8 +1,8 @@
 async function hasColumn (name, coll) {
   const { importPkg } = this.bajo.helper
   const { getInfo } = this.bajoDb.helper
-  const { find } = await importPkg('lodash-es')
-  const { schema } = await getInfo(coll)
+  const { find } = this.bajo.helper._
+  const { schema } = getInfo(coll)
   const result = find(schema.properties, { name })
   return !!result
 }

package/bajo/helper/verify/api-key.js

@@ -1,6 +1,6 @@
 export async function getSetting (type, source) {
   const { importPkg, getConfig, defaultsDeep } = this.bajo.helper
-  const { get } = await importPkg('lodash-es')
+  const { get } = this.bajo.helper._
   const cfg = getConfig('sumba')
   const setting = defaultsDeep(get(cfg, `auth.${source}.${type}`, {}), get(cfg, `auth.common.${type}`, {}))
   if (type === 'basic') setting.type = 'Basic'
@@ -9,7 +9,7 @@ export async function getSetting (type, source) {
 
 export async function getToken (type, req, source) {
   const { importPkg } = this.bajo.helper
-  const { isEmpty } = await importPkg('lodash-es')
+  const { isEmpty } = this.bajo.helper._
   const setting = await getSetting.call(this, type, source)
   let token = req.headers[setting.headerKey.toLowerCase()]
   if (!['basic'].includes(type) && isEmpty(token)) token = req.query[setting.qsKey]

package/bajo/helper/verify/basic.js

@@ -2,7 +2,7 @@ import { getSetting } from './api-key.js'
 
 async function setHeader (setting, reply) {
   const { importPkg } = this.bajo.helper
-  const { isString } = await importPkg('lodash-es')
+  const { isString } = this.bajo.helper._
   let header = setting.type
   const exts = []
   if (isString(setting.realm)) exts.push(`realm="${setting.realm}"`)
@@ -16,7 +16,7 @@ async function verifyBasic (ctx, req, reply, source) {
   const { importPkg, print, error } = this.bajo.helper
   const { getUserFromUsernamePassword } = this.sumba.helper
   const { getUser } = this.sumba.helper
-  const { isEmpty } = await importPkg('lodash-es')
+  const { isEmpty } = this.bajo.helper._
   const setting = await getSetting.call(this, 'basic', source)
   let authInfo
   const parts = (req.headers.authorization || '').split(' ')

package/bajo/helper/verify/jwt.js

@@ -4,7 +4,7 @@ async function verifyJwt (ctx, req, reply, source) {
   const { importPkg, error } = this.bajo.helper
   const { recordGet } = this.bajoDb.helper
   const { getUser } = this.sumba.helper
-  const { isEmpty } = await importPkg('lodash-es')
+  const { isEmpty } = this.bajo.helper._
   const fastJwt = await importPkg('bajo-extra:fast-jwt')
   const { createVerifier } = fastJwt
   const setting = await getSetting.call(this, 'jwt', source)

package/bajo/hook/bajoDb.SumbaUser@on-before-record-validation.js

@@ -2,7 +2,7 @@ import { joiPasswordExtendCore } from 'joi-password'
 
 async function bajoDbSiteUserOnBeforeRecordValidation (body, options = {}) {
   const { importPkg, getConfig } = this.bajo.helper
-  const { set } = await importPkg('lodash-es')
+  const { set } = this.bajo.helper._
   const joi = await importPkg('bajo-db:joi')
   const cfg = getConfig('sumba')
   const joiPassword = joi.extend(joiPasswordExtendCore)

package/bajo/hook/bajoDb@on-before-record-create.js

@@ -2,7 +2,7 @@ const bajoDbOnBeforeRecordCreate = {
   level: 1000,
   handler: async function (coll, body, options) {
     const { importPkg } = this.bajo.helper
-    const { get } = await importPkg('lodash-es')
+    const { get } = this.bajo.helper._
     const { hasColumn } = this.sumba.helper
     const item = { siteId: 'req.site.id', userId: 'req.user.id' }
     for (const i in item) {

package/bajo/hook/bajoDb@on-before-record-find.js

@@ -2,7 +2,7 @@ const bajoDbOnBeforeRecordFind = {
   level: 1000,
   handler: async function (coll, filter, options) {
     const { importPkg } = this.bajo.helper
-    const { isEmpty, cloneDeep, get, set } = await importPkg('lodash-es')
+    const { isEmpty, cloneDeep, get, set } = this.bajo.helper._
     const { hasColumn } = this.sumba.helper
     const item = { siteId: 'req.site.id', userId: 'req.user.id' }
     for (const i in item) {

package/bajo/hook/bajoDb@on-before-record-get.js

@@ -1,7 +1,7 @@
 export async function checker (coll, id, req) {
   const { importPkg, error } = this.bajo.helper
   const { recordFind } = this.bajoDb.helper
-  const { get } = await importPkg('lodash-es')
+  const { get } = this.bajo.helper._
   const { hasColumn } = this.sumba.helper
   const item = { siteId: 'site.id', userId: 'user.id' }
   for (const i in item) {

package/bajoAdmin/mpa/lib/pre-handler.js

@@ -5,7 +5,7 @@ async function preHandler (ctx, req, reply) {
   const buildPagesMenu = await importModule(`${cfg.dir.pkg}/lib//build-pages-menu.js`)
   req.menu = req.menu ?? {}
   req.menu.coll = await buildCollMenu.call(this)
-  req.menu.pages = await buildPagesMenu.call(this)
+  req.menu.pages = buildPagesMenu.call(this)
 }
 
 export default preHandler

package/bajoDb/feature/lat-lng.js

@@ -2,7 +2,7 @@ import latLngHook from '../../lib/lat-lng-hook.js'
 
 async function latLng (opts = {}) {
   const { importPkg } = this.bajo.helper
-  const { merge } = await importPkg('lodash-es')
+  const { merge } = this.bajo.helper._
   opts.fieldNameLat = opts.fieldNameLat ?? 'lat'
   opts.fieldNameLng = opts.fieldNameLng ?? 'lng'
   opts.scale = opts.scale ?? 5

package/bajoDb/feature/slug.js

@@ -3,7 +3,7 @@ import slug from 'slug'
 async function autoInc ({ schema, body, opts }) {
   const { importPkg } = this.bajo.helper
   const { recordFind } = this.bajoDb.helper
-  const { set, last } = await importPkg('lodash-es')
+  const { set, last } = this.bajo.helper._
   const query = set({}, opts.fieldName, { $regex: new RegExp('^' + body[opts.fieldName]) })
   const sort = set({}, opts.fieldName, -1)
   const options = { noHook: true, skipCache: true, thrownNotFound: false }
@@ -41,7 +41,7 @@ async function mainFn (opts = {}) {
     hook: {
       beforeCreate: async function ({ schema, body }) {
         const { importPkg, error } = this.bajo.helper
-        const { isEmpty, isString } = await importPkg('lodash-es')
+        const { isEmpty, isString } = this.bajo.helper._
         if (isEmpty(body[opts.fieldName])) {
           if (isString(opts.fieldSource)) opts.fieldSource = [opts.fieldSource]
           const source = []

package/bajoWebMpa/route/activation.js

@@ -2,7 +2,7 @@ async function activation (ctx, req, reply) {
   const { getConfig, importPkg, error } = this.bajo.helper
   const { recordFind, recordUpdate } = this.bajoDb.helper
   const { routePath } = this.bajoWeb.helper
-  const { isEmpty } = await importPkg('lodash-es')
+  const { isEmpty } = this.bajo.helper._
   const cfg = getConfig('sumba')
   const { key } = req.query
   let err

package/bajoWebMpa/route/change-password.js

@@ -4,7 +4,7 @@ const profile = {
     const { defaultsDeep, importPkg } = this.bajo.helper
     const { attachmentCopyUploaded } = this.bajoDb.helper
     const { recordUpdate } = this.bajoWeb.helper
-    const { has } = await importPkg('lodash-es')
+    const { has } = this.bajo.helper._
     let form = defaultsDeep(req.body, req.user)
     if (req.method === 'POST') {
       try {

package/bajoWebMpa/route/profile.js

@@ -4,7 +4,7 @@ const profile = {
     const { defaultsDeep, importPkg } = this.bajo.helper
     const { attachmentCopyUploaded } = this.bajoDb.helper
     const { recordUpdate } = this.bajoWeb.helper
-    const { has } = await importPkg('lodash-es')
+    const { has } = this.bajo.helper._
     let form = defaultsDeep(req.body, req.user)
     if (req.method === 'POST') {
       try {

package/bajoWebMpa/route/signin.js

@@ -4,8 +4,7 @@ const signin = {
     const { getConfig, importPkg } = this.bajo.helper
     const { routePath } = this.bajoWeb.helper
     const { getUserFromUsernamePassword } = this.sumba.helper
-    const { emit } = this.bajoEmitter.helper
-    const { isEmpty, pick } = await importPkg('lodash-es')
+    const { isEmpty, pick } = this.bajo.helper._
     const cfg = getConfig('sumba')
     let { username, password, referer } = req.body || {}
     if (req.session.ref) referer = req.session.ref
@@ -14,7 +13,7 @@ const signin = {
     if (req.method === 'POST') {
       try {
         const user = pick(await getUserFromUsernamePassword(username, password, req), ['id', 'username', 'email', 'siteId'])
-        emit('sumba.signin', user)
+        if (this.bajoEmitter) this.bajoEmitter.helper.emit('sumba.signin', user)
         req.session.user = user
         const { query, params } = req
         const url = !isEmpty(referer) ? referer : routePath(cfg.redirect.home, { query, params })

package/bajoWebMpa/route/signout.js

@@ -3,7 +3,7 @@ const signout = {
   handler: async function (ctx, req, reply) {
     const { getConfig, importPkg } = this.bajo.helper
     const { routePath } = this.bajoWeb.helper
-    const { isEmpty } = await importPkg('lodash-es')
+    const { isEmpty } = this.bajo.helper._
     const cfg = getConfig('sumba')
     let { referer } = req.body || {}
     if (req.session.ref) referer = req.session.ref

package/bajoWebRestapi/route/access-token/@type/create.js

@@ -7,12 +7,12 @@ async function create () {
       '2xx': {
         description: 'Successfull response',
         type: 'object',
-        properties: await this.bajoWebRestapi.helper.transformResult({ data })
+        properties: this.bajoWebRestapi.helper.transformResult({ data })
       }
     }
   }
 
-  const handler = async function create (ctx, req, reply) {
+  const handler = async function (ctx, req, reply) {
     const { error } = this.bajo.helper
     const { hash } = this.bajoExtra.helper
     const { getUserFromUsernamePassword, createJwtFromUserRecord } = this.sumba.helper

package/bajoWebRestapi/route/account/api-key/get.js

@@ -6,7 +6,7 @@ async function get ({ ctx }) {
       '2xx': {
         description: 'Successfull response',
         type: 'object',
-        properties: await this.bajoWebRestapi.helper.transformResult({ data })
+        properties: this.bajoWebRestapi.helper.transformResult({ data })
       }
     }
   }

package/bajoWebRestapi/route/account/change-password/update.js

@@ -34,7 +34,7 @@ async function update ({ ctx }) {
       '2xx': {
         description: 'Successfull response',
         type: 'object',
-        properties: await this.bajoWebRestapi.helper.transformResult({ data })
+        properties: this.bajoWebRestapi.helper.transformResult({ data })
       }
     }
   }

package/bajoWebRestapi/route/account/profile/update.js

@@ -4,7 +4,7 @@ const hidden = ['password', 'token', 'siteId']
 async function get ({ ctx }) {
   const { importPkg } = this.bajo.helper
   const { recordUpdate } = this.bajoWeb.helper
-  const { omit } = await importPkg('lodash-es')
+  const { omit } = this.bajo.helper._
   const { docSchemaColl } = this.bajoWebRestapi.helper
   const schema = await docSchemaColl({ coll, method: 'update', ctx, options: { hidden, noId: true } })
   const handler = async function get (ctx, req, reply, options) {

package/bajoWebRestapi/route/account/setting/update.js

@@ -4,7 +4,7 @@ const hidden = ['userId', 'siteId']
 async function get ({ ctx }) {
   const { importPkg } = this.bajo.helper
   const { recordUpdate } = this.bajoWeb.helper
-  const { omit } = await importPkg('lodash-es')
+  const { omit } = this.bajo.helper._
   const { docSchemaColl } = this.bajoWebRestapi.helper
   const schema = await docSchemaColl({ coll, method: 'update', ctx, options: { hidden, noId: true } })
   const handler = async function get (ctx, req, reply, options) {

package/bajoWebRestapi/route/site/coll-builder.json

@@ -0,0 +1,3 @@
+{
+  "coll": "SumbaSite"
+}

package/bajoWebRestapi/route/site-setting/coll-builder.json

@@ -0,0 +1,3 @@
+{
+  "coll": "SumbaSiteSetting"
+}

package/bajoWebRestapi/route/user/coll-builder.json

@@ -0,0 +1,4 @@
+{
+  "coll": "SumbaUser",
+  "hidden": ["password", "token"]
+}

package/bajoWebRestapi/route/user-setting/coll-builder.json

@@ -0,0 +1,3 @@
+{
+  "coll": "SumbaUserSetting"
+}

package/lib/check-lang.js

@@ -1,6 +1,6 @@
 async function checkLang (req, reply) {
   const { importPkg } = this.bajo.helper
-  const { get } = await importPkg('lodash-es')
+  const { get } = this.bajo.helper._
   if (!req.session) return
   if (req.lang && req.langDetector) {
     req.session.lang = req.lang

package/lib/check-theme.js

@@ -1,6 +1,6 @@
 async function checkTheme (req, reply) {
   const { getConfig, importPkg } = this.bajo.helper
-  const { get } = await importPkg('lodash-es')
+  const { get } = this.bajo.helper._
   if (!req.site) return
   req.theme = get(req, 'site.setting.theme', getConfig('bajoWeb').theme)
   if (get(req, 'site.setting.allowUserTheme')) req.theme = get(req, 'user.setting.theme', req.theme)

package/lib/check-user-id.js

@@ -1,6 +1,6 @@
 async function checker (req, container) {
   const { importPkg, getConfig } = this.bajo.helper
-  const { get } = await importPkg('lodash-es')
+  const { get } = this.bajo.helper._
   const outmatch = await importPkg('outmatch')
   let match
   for (const item of container) {
@@ -52,7 +52,7 @@ async function checkUserId (req, reply, source) {
   const { getConfig, error, importPkg } = this.bajo.helper
   const ctx = this[source].instance
   if (!req.routeOptions.url) return
-  const { isEmpty, camelCase } = await importPkg('lodash-es')
+  const { isEmpty, camelCase } = this.bajo.helper._
   const match = await checker.call(this, req, this.sumba.secureRoutes)
   if (!match) {
     await anonymous.call(this, req)

package/lib/collect-routes.js

@@ -4,7 +4,7 @@ const invIndexes = []
 async function collect (type, { file, plugin, dir }) {
   const { readConfig, importPkg } = this.bajo.helper
   const { routeDir } = this.bajoWeb.helper
-  const { trim } = await importPkg('lodash-es')
+  const { trim } = this.bajo.helper._
   const { hash } = this.bajoExtra.helper
   const routes = await readConfig(file, { ignoreError: true })
   let source = trim(file.replace(dir, '').split('@')[0], '/')

package/lib/update-password.js

@@ -1,7 +1,7 @@
 async function updatePassword (body) {
   const { importPkg } = this.bajo.helper
   const { isBcrypt, hash } = this.bajoExtra.helper
-  const { isEmpty } = await importPkg('lodash-es')
+  const { isEmpty } = this.bajo.helper._
   if (isEmpty(body.password)) return
   if (!isBcrypt(body.password)) body.password = await hash(body.password, 'bcrypt')
   body.token = await hash(await hash(body.password))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "0.1.11",
+  "version": "0.3.0",
   "description": "Bajo Framework's Biz Suite",
   "main": "index.js",
   "scripts": {