waibu-db 2.0.0 → 2.1.0

package/extend/waibuBootstrap/theme/component/factory/btn-back.js

@@ -5,8 +5,8 @@ async function btnBack () {
 
   return class WdbBtnBack extends WdbBase {
     build = async () => {
-      const { isEmpty } = this.plugin.app.bajo.lib._
-      const { attrToArray } = this.plugin.app.waibuMpa
+      const { isEmpty } = this.app.lib._
+      const { attrToArray } = this.app.waibuMpa
       const { req } = this.component
       this.params.noTag = true
       if (isEmpty(this.params.attr.content)) this.params.attr.content = req.t('back')

package/extend/waibuBootstrap/theme/component/factory/btn-clone.js

@@ -6,7 +6,7 @@ async function btnClone () {
   return class WdbBtnClone extends WdbBase {
     build = async () => {
       const { req } = this.component
-      const { isEmpty, get } = this.plugin.app.bajo.lib._
+      const { isEmpty, get } = this.app.lib._
       this.params.noTag = true
       const schema = get(this, 'component.locals.schema', {})
       if (schema.view.disabled.includes('create')) {

package/extend/waibuBootstrap/theme/component/factory/btn-columns.js

@@ -5,10 +5,10 @@ async function btnColumns () {
 
   return class WdbBtnColumns extends WdbBase {
     build = async () => {
-      const { get, isEmpty, without } = this.plugin.app.bajo.lib._
-      const { jsonStringify } = this.plugin.app.waibuMpa
+      const { get, isEmpty, without } = this.app.lib._
+      const { jsonStringify } = this.app.waibuMpa
       const { req } = this.component
-      const qsKey = this.plugin.app.waibu.config.qsKey
+      const qsKey = this.app.waibu.config.qsKey
       const schema = get(this, 'component.locals.schema', {})
       const count = get(this, 'component.locals.list.count', 0)
       if (count === 0) this.params.attr.triggerDisabled = true

package/extend/waibuBootstrap/theme/component/factory/btn-delete.js

@@ -6,8 +6,8 @@ async function btnDelete () {
   return class WdbBtnDelete extends WdbBase {
     build = async () => {
       const { req } = this.component
-      const { generateId } = this.plugin.app.bajo
-      const { isEmpty, get } = this.plugin.app.bajo.lib._
+      const { generateId } = this.app.lib.aneka
+      const { isEmpty, get } = this.app.lib._
       this.params.noTag = true
       const schema = get(this, 'component.locals.schema', {})
       if (schema.view.disabled.includes('remove')) {

package/extend/waibuBootstrap/theme/component/factory/btn-details.js

@@ -6,8 +6,8 @@ async function btnDetails () {
   return class WdbBtnDetails extends WdbBase {
     build = async () => {
       const { req } = this.component
-      const { generateId } = this.plugin.app.bajo
-      const { isEmpty, get } = this.plugin.app.bajo.lib._
+      const { generateId } = this.app.lib.aneka
+      const { isEmpty, get } = this.app.lib._
       this.params.noTag = true
       const schema = get(this, 'component.locals.schema', {})
       if (schema.view.disabled.includes('update')) {

package/extend/waibuBootstrap/theme/component/factory/btn-edit.js

@@ -6,8 +6,8 @@ async function btnEdit () {
   return class WdbBtnEdit extends WdbBase {
     build = async () => {
       const { req } = this.component
-      const { generateId } = this.plugin.app.bajo
-      const { isEmpty, get } = this.plugin.app.bajo.lib._
+      const { generateId } = this.app.lib.aneka
+      const { isEmpty, get } = this.app.lib._
       this.params.noTag = true
       const schema = get(this, 'component.locals.schema', {})
       if (schema.view.disabled.includes('update')) {

package/extend/waibuBootstrap/theme/component/factory/btn-export.js

@@ -9,7 +9,7 @@ async function btnExport () {
     ]
 
     build = async () => {
-      const { isEmpty, get } = this.plugin.app.bajo.lib._
+      const { isEmpty, get } = this.app.lib._
       const { req } = this.component
       this.params.noTag = true
       const schema = get(this, 'component.locals.schema', {})

package/extend/waibuBootstrap/theme/component/factory/echarts-bar.js

@@ -5,8 +5,8 @@ async function echartsBar () {
 
   return class WdbEchartsBar extends WdbEcharts {
     build = async () => {
-      const { jsonStringify } = this.plugin.app.waibuMpa
-      const { merge } = this.plugin.lib._
+      const { jsonStringify } = this.app.waibuMpa
+      const { merge } = this.app.lib._
       merge(this.setting, {
         tooltip: {
           trigger: 'axis',

package/extend/waibuBootstrap/theme/component/factory/echarts-pie.js

@@ -5,8 +5,8 @@ async function echartsPie () {
 
   return class WdbEchartsPie extends WdbEcharts {
     build = async () => {
-      const { jsonStringify } = this.plugin.app.waibuMpa
-      const { merge } = this.plugin.lib._
+      const { jsonStringify } = this.app.waibuMpa
+      const { merge } = this.app.lib._
       merge(this.setting, {
         tooltip: {
           trigger: 'item'

package/extend/waibuBootstrap/theme/component/factory/echarts.js

@@ -10,7 +10,7 @@ async function echarts () {
 
     constructor (options) {
       super(options)
-      const { generateId } = this.plugin.app.bajo
+      const { generateId } = this.app.lib.aneka
       this.defSetting = {
         grid: {
           top: 8,
@@ -27,8 +27,8 @@ async function echarts () {
     }
 
     _build = ({ setting = {}, onLoad = [] } = {}) => {
-      const { jsonStringify } = this.plugin.app.waibuMpa
-      const { merge, isArray } = this.plugin.app.bajo.lib._
+      const { jsonStringify } = this.app.waibuMpa
+      const { merge, isArray } = this.app.lib._
       if (!isArray(onLoad)) onLoad = [onLoad]
       const option = merge({}, this.defSetting, this.setting, setting)
       this.component.addScriptBlock('alpineInit', `

package/extend/waibuBootstrap/theme/component/factory/form.js

@@ -5,8 +5,8 @@ async function form () {
 
   return class WdbForm extends WdbBase {
     build = async () => {
-      const { get, find, filter, forOwn, isEmpty } = this.plugin.lib._
-      const { base64JsonEncode } = this.plugin.app.waibuMpa
+      const { get, find, filter, forOwn, isEmpty } = this.app.lib._
+      const { base64JsonEncode } = this.app.waibuMpa
       const schema = get(this, 'component.locals.schema', {})
       const body = []
       const xModels = get(schema, 'view.x.model', [])

package/extend/waibuBootstrap/theme/component/factory/pagination.js

@@ -1,7 +1,7 @@
 import wdbBase from '../wdb-base.js'
 
 export function getUrlOpts (params = {}) {
-  const { get } = this.plugin.app.bajo.lib._
+  const { get } = this.app.lib._
   return {
     params,
     excludes: [
@@ -17,8 +17,8 @@ async function pagination () {
   return class WdbPagination extends WdbBase {
     build = async () => {
       const { req } = this.component
-      const { attrToObject, paginationLayout, groupAttrs } = this.plugin.app.waibuMpa
-      const { get, isNumber } = this.plugin.app.bajo.lib._
+      const { attrToObject, paginationLayout, groupAttrs } = this.app.waibuMpa
+      const { get, isNumber } = this.app.lib._
       const schema = get(this, 'component.locals.schema', {})
       if (schema.view.disabled.includes('find')) {
         this.params.html = ''

package/extend/waibuBootstrap/theme/component/factory/query.js

@@ -5,10 +5,10 @@ async function query () {
 
   return class WdbQuery extends WdbBase {
     build = async () => {
-      const { generateId } = this.plugin.app.bajo
-      const { jsonStringify } = this.plugin.app.waibuMpa
-      const { find, get, without, isEmpty, filter, upperFirst } = this.plugin.app.bajo.lib._
-      const qsKey = this.plugin.app.waibu.config.qsKey
+      const { generateId } = this.app.lib.aneka
+      const { jsonStringify } = this.app.waibuMpa
+      const { find, get, without, isEmpty, filter, upperFirst } = this.app.lib._
+      const qsKey = this.app.waibu.config.qsKey
       const schema = get(this, 'component.locals.schema', {})
       if (schema.view.disabled.includes('find')) {
         this.params.html = ''

package/extend/waibuBootstrap/theme/component/factory/recs-info.js

@@ -7,8 +7,8 @@ async function recsInfo () {
   return class WdbRecsInfo extends WdbBase {
     build = async () => {
       const { req } = this.component
-      const { attrToObject, groupAttrs, attrToArray } = this.plugin.app.waibuMpa
-      const { get, isEmpty, omit, merge } = this.plugin.app.bajo.lib._
+      const { attrToObject, groupAttrs, attrToArray } = this.app.waibuMpa
+      const { get, isEmpty, omit, merge } = this.app.lib._
       const schema = get(this, 'component.locals.schema', {})
       if (schema.view.disabled.includes('find')) {
         this.params.html = ''

package/extend/waibuBootstrap/theme/component/factory/table.js

@@ -5,7 +5,7 @@ async function table () {
 
   return class WdbTable extends WdbBase {
     isRightAligned = (field, schema) => {
-      const { get, find } = this.plugin.app.bajo.lib._
+      const { get, find } = this.app.lib._
       const prop = find(schema.properties, { name: field })
       if (!prop) return false
       let value = get(schema, 'view.alignEnd', []).includes(field)
@@ -15,17 +15,17 @@ async function table () {
 
     isNoWrap = (field, schema, bodyNowrap) => {
       if (bodyNowrap) return true
-      const { get } = this.plugin.app.bajo.lib._
+      const { get } = this.app.lib._
       return get(schema, 'view.noWrap', []).includes(field)
     }
 
     _defFormatter = async ({ req, key, value, data, schema }) => {
-      const { get, find } = this.plugin.lib._
-      const { escape } = this.plugin.app.waibu
+      const { get, find } = this.app.lib._
+      const { escape } = this.app.waibu
       const prop = find(schema.properties, { name: key })
       if (!prop) return value
       if (prop.type === 'boolean') {
-        value = (await this.component.buildTag({ tag: 'icon', attr: { name: `circle${data[key] ? 'Check' : ''}` } })) +
+        value = (await this.component.buildTag({ tag: 'icon', attr: { name: `circle${data[key] ? 'Check' : 'Cross'}` } })) +
           ' ' + (req.t(data[key] ? 'Yes' : 'No'))
       } else if (['string', 'text'].includes(prop.type)) {
         if (!get(schema, 'view.noEscape', []).includes(key)) value = escape(value)
@@ -35,10 +35,10 @@ async function table () {
 
     build = async () => {
       const { req } = this.component
-      const { escape } = this.plugin.app.waibu
-      const { formatRecord } = this.plugin.app.waibuDb
-      const { attrToArray, groupAttrs } = this.plugin.app.waibuMpa
-      const { get, omit, set, find, isEmpty, without, merge } = this.plugin.lib._
+      const { escape } = this.app.waibu
+      const { formatRecord } = this.app.waibuDb
+      const { attrToArray, groupAttrs } = this.app.waibuMpa
+      const { get, omit, set, find, isEmpty, without, merge } = this.app.lib._
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
       const prettyUrl = this.params.attr.prettyUrl
@@ -59,7 +59,7 @@ async function table () {
         this.params.html = ''
         return
       }
-      const qsKey = this.plugin.app.waibu.config.qsKey
+      const qsKey = this.app.waibu.config.qsKey
       let fields = without(get(this, `component.locals._meta.query.${qsKey.fields}`, '').split(','), '')
       if (isEmpty(fields)) fields = schema.view.fields
       if (!isEmpty(schema.view.hidden)) fields = without(fields, ...schema.view.hidden)
@@ -101,7 +101,7 @@ async function table () {
           const attr = this.isRightAligned(f, schema) ? { text: 'align:end' } : {}
           const content = [
             await this.component.buildTag({ tag: 'div', attr, html: head }),
-            await this.component.buildTag({ tag: 'a', attr: { icon, href }, prepend: '<div class="ms-1">', append: '</div>' })
+            await this.component.buildTag({ tag: 'a', attr: { icon, href, noIconLink: true }, prepend: '<div class="ms-1">', append: '</div>' })
           ]
           head = await this.component.buildTag({ tag: 'div', attr: { flex: 'justify-content:between align-items:end' }, html: content.join('\n') })
         }

package/extend/waibuRestApi/route/@model/@id/get.js

@@ -1,5 +1,5 @@
 async function get (req, reply) {
-  return await this.recordGet({ req, reply })
+  return await this.getRecord({ req, reply })
 }
 
 export default get

package/extend/waibuRestApi/route/@model/@id/remove.js

@@ -1,5 +1,5 @@
 async function remove (req, reply) {
-  return await this.recordRemove({ req, reply })
+  return await this.removeRecord({ req, reply })
 }
 
 export default remove

package/extend/waibuRestApi/route/@model/@id/update.js

@@ -1,5 +1,5 @@
 async function update (req, reply) {
-  return await this.recordUpdate({ req, reply })
+  return await this.updateRecord({ req, reply })
 }
 
 export default update

package/extend/waibuRestApi/route/@model/create.js

@@ -1,5 +1,5 @@
 async function create (req, reply) {
-  return await this.recordCreate({ req, reply })
+  return await this.createRecord({ req, reply })
 }
 
 export default create

package/extend/waibuRestApi/route/@model/find.js

@@ -1,6 +1,6 @@
 async function find (req, reply) {
-  const { isSet } = this.lib.aneka
-  const { parseObject } = this.app.bajo
+  const { isSet } = this.app.lib.aneka
+  const { parseObject } = this.app.lib
   let { fields, count } = this.getParams(req)
   let rels = []
   const headers = parseObject(req.headers, { parseValue: true })
@@ -8,7 +8,7 @@ async function find (req, reply) {
   if (isSet(headers['x-rels'])) rels = headers['x-rels']
   if (typeof rels === 'string' && !['*', 'all'].includes(rels)) rels = [rels]
   const options = { fields, count, rels }
-  return await this.recordFind({ req, reply, options })
+  return await this.findRecord({ req, reply, options })
 }
 
 export default find

package/extend/waibuRestApi/route/@model/stat/@stat/find.js

@@ -0,0 +1,8 @@
+async function stat (req, reply) {
+  const { camelCase } = this.app.lib._
+  const method = camelCase(`create ${req.params.stat}`)
+  if (!this[method]) throw this.error('_notFound')
+  return await this[method]({ req, reply })
+}
+
+export default stat

package/index.js

@@ -1,11 +1,31 @@
+import countRecord from './lib/method/count-record.js'
+import createAggregate from './lib/method/create-aggregate.js'
+import createHistogram from './lib/method/create-histogram.js'
+import createRecord from './lib/method/create-record.js'
+import findOneRecord from './lib/method/find-one-record.js'
+import findRecord from './lib/method/find-record.js'
+import getSchemaExt from './lib/method/get-schema-ext.js'
+import getRecord from './lib/method/get-record.js'
+import removeRecord from './lib/method/remove-record.js'
+import updateRecord from './lib/method/update-record.js'
+
+/**
+ * Plugin factory
+ *
+ * @param {string} pkgName - NPM package name
+ * @returns {class}
+ */
 async function factory (pkgName) {
   const me = this
 
-  return class WaibuDb extends this.lib.Plugin {
+  /**
+   * WaibuDb class
+   *
+   * @class
+   */
+  class WaibuDb extends this.app.baseClass.Base {
     constructor () {
       super(pkgName, me.app)
-      this.alias = 'wdb'
-      this.dependencies = ['dobo', 'waibu', 'bajo-queue', 'dobo-extra']
       this.config = {
         waibu: {
           prefix: 'db',
@@ -22,15 +42,34 @@ async function factory (pkgName) {
           count: false,
           patchEnabled: false
         },
-        modelRestApi: false
+        enableRestApiForModel: false
+      }
+      this.methodMap = {
+        create: 'POST',
+        find: 'GET',
+        get: 'GET',
+        update: 'PUT',
+        remove: 'DELETE'
       }
+
+      this.selfBind([
+        'countRecord',
+        'createAggregate',
+        'createHistogram',
+        'createRecord',
+        'findOneRecord',
+        'findRecord',
+        'getSchemaExt',
+        'getRecord',
+        'removeRecord',
+        'updateRecord'
+      ])
     }
 
     exportData = async (params) => {
       const { getPlugin } = this.app.bajo
-      const { get } = this.lib._
-      const { fs } = this.lib
-      const { recordUpdate } = this.app.dobo
+      const { get } = this.app.lib._
+      const { fs } = this.app.lib
       const { exportTo } = this.app.doboExtra
       const { downloadDir } = getPlugin('sumba')
       const model = get(params, 'payload.data.name')
@@ -43,38 +82,37 @@ async function factory (pkgName) {
         fields
       }
       options.filter.sort = 'id:1'
-      const dmodel = 'SumbaDownload'
+      const dmodel = this.app.dobo.getModel('SumbaDownload')
       try {
-        await recordUpdate(dmodel, id, { status: 'PROCESSING' })
+        await dmodel.updateRecord(id, { status: 'PROCESSING' })
         await exportTo(model, dest, options)
         const { size } = fs.statSync(dest)
-        await recordUpdate(dmodel, id, { size, status: 'COMPLETE' })
+        await dmodel.updateRecord(id, { size, status: 'COMPLETE' })
       } catch (err) {
-        await recordUpdate(dmodel, id, { status: 'FAIL' })
+        await dmodel.updateRecord(id, { status: 'FAIL' })
       }
     }
 
     adminMenu = async (locals, req) => {
       const { getPluginPrefix } = this.app.waibu
-      const { pascalCase } = this.lib.aneka
+      const { pascalCase } = this.app.lib.aneka
       const { getAppTitle } = this.app.waibuMpa
-      const { camelCase, map, pick, groupBy, keys, kebabCase, filter, get } = this.lib._
+      const { camelCase, map, groupBy, keys, kebabCase, filter, get, isArray } = this.app.lib._
 
-      const prefix = getPluginPrefix(this.name)
-      const schemas = filter(this.app.dobo.schemas, s => {
+      const prefix = getPluginPrefix(this.ns)
+      const allModels = this.app.dobo.models
+      const models = filter(allModels, s => {
         const byModelFind = !s.disabled.includes('find')
-        let modelDisabled = get(this, `app.${s.ns}.config.waibuAdmin.modelDisabled`)
-        if (modelDisabled) {
-          const allModels = map(filter(this.app.dobo.schemas, { ns: s.ns }), 'name')
-          if (modelDisabled === 'all') modelDisabled = allModels
-          else modelDisabled = map(modelDisabled, m => pascalCase(`${this.app[s.ns].alias} ${m}`))
-        } else modelDisabled = []
+        const disabled = get(this, `app.${s.plugin.ns}.config.waibuAdmin.modelDisabled`, [])
+        let modelDisabled = []
+        if (['*', 'all'].includes(disabled)) modelDisabled = map(filter(allModels, m => m.plugin.ns === s.plugin.ns), 'name')
+        else if (isArray(disabled)) modelDisabled = map(disabled, m => pascalCase(`${this.app[s.plugin.ns].alias} ${m}`))
         const byDbDisabled = !modelDisabled.includes(s.name)
         return byModelFind && byDbDisabled
       })
-      const omenu = groupBy(map(schemas, s => {
-        const item = pick(s, ['name', 'ns'])
-        item.nsTitle = getAppTitle(s.ns)
+      const omenu = groupBy(map(models, s => {
+        const item = { name: s.name, ns: s.plugin.ns }
+        item.nsTitle = getAppTitle(s.plugin.ns)
         return item
       }), 'nsTitle')
       const menu = []
@@ -93,7 +131,89 @@ async function factory (pkgName) {
       }
       return menu
     }
+
+    getParams = (req, ...items) => {
+      const { map, trim, get } = this.app.lib._
+      let fields
+      req.query = req.query ?? {}
+      req.params = req.params ?? {}
+      if (req.query.fields) fields = map((req.query.fields ?? '').split(','), i => trim(i))
+      const params = {
+        fields,
+        count: get(this, 'config.dbModel.count', false),
+        body: req.body
+      }
+      items.forEach(i => {
+        params[i] = req.params[i]
+      })
+      return params
+    }
+
+    getLookupData = async ({ model, req, data, id = 'id', field, query }) => {
+      const { set, map } = this.app.lib._
+      const $in = map(data, id)
+      const q = query ?? set({}, field, { $in })
+      const options = {
+        dataOnly: true,
+        limit: -1,
+        query: q
+      }
+      return await this.findRecord({ model, req, options })
+    }
+
+    formatRecord = async ({ data, req, schema, options = {} }) => {
+      const { isArray } = this.app.lib._
+      if (!isArray(data)) return await this.formatRow({ data, req, schema, options })
+      const items = []
+      for (const d of data) {
+        const item = await this.formatRow({ data: d, req, schema, options })
+        items.push(item)
+      }
+      return items
+    }
+
+    formatRow = async ({ data, req, schema, options = {} }) => {
+      const { get, find, isFunction, cloneDeep } = this.app.lib._
+      const { format, callHandler } = this.app.bajo
+      const { escape } = this.app.waibu
+      const fields = get(schema, 'view.fields', Object.keys(schema.properties))
+      const rec = cloneDeep(data)
+      for (const f of fields) {
+        if (f === '_rel') continue
+        let prop = find(schema.properties, { name: f })
+        if (!prop) prop = find(schema.view.calcFields, { name: f })
+        if (!prop) continue
+        const opts = {
+          lang: options.lang ?? (req ? req.lang : undefined),
+          longitude: ['lng', 'longitude'].includes(f),
+          latitude: ['lat', 'latitude'].includes(f),
+          speed: ['speed'].includes(f),
+          degree: ['course', 'heading'].includes(f),
+          distance: ['distance'].includes(f)
+        }
+        rec[f] = format(data[f], prop.type, opts)
+        const vf = get(schema, `view.valueFormatter.${f}`)
+        if (vf) {
+          if (isFunction(vf)) rec[f] = await vf.call(this, data[f], data)
+          else rec[f] = await callHandler(vf, { req, value: data[f], data })
+        } else if (['string', 'text'].includes(prop.type)) rec[f] = escape(rec[f])
+      }
+      return rec
+    }
+
+    countRecord = countRecord
+    createAggregate = createAggregate
+    createHistogram = createHistogram
+    createRecord = createRecord
+    findOneRecord = findOneRecord
+    findRecord = findRecord
+    getSchemaExt = getSchemaExt
+    getRecord = getRecord
+    removeRecord = removeRecord
+    updateRecord = updateRecord
   }
+
+  return WaibuDb
 }
 
 export default factory

package/lib/crud/add-handler.js

@@ -1,18 +1,18 @@
 async function addHandler ({ req, reply, model, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
-  const { pascalCase } = this.lib.aneka
-  const { recordCreate, recordGet, getSchemaExt } = this.app.waibuDb
+  const { pascalCase } = this.app.lib.aneka
+  const { createRecord, getRecord, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
-  const { defaultsDeep } = this.lib.aneka
-  const { pick, map, merge, omit, isEmpty } = this.lib._
+  const { defaultsDeep } = this.app.lib.aneka
+  const { pick, map, merge, omit } = this.app.lib._
   const opts = {}
-  model = model ?? pascalCase(req.params.model)
+  model = pascalCase(model ?? req.params.model)
   const { schema } = await getSchemaExt(model, 'add', merge({}, { params }, options))
   if (schema.disabled.includes('create')) return await reply.view(templateDisabled, { action: 'add' })
   // req.query.attachment = true
   opts.fields = schema.view.fields
   let def = {}
   if (req.method === 'GET' && req.query.mode === 'clone' && req.query.id) {
-    const resp = await recordGet({ model, req, id: req.query.id, options: { fields: map(schema.properties, 'name') } })
+    const resp = await getRecord({ model, req, id: req.query.id, options: { fields: map(schema.properties, 'name') } })
     def = omit(resp.data, ['id', 'createdAt', 'updatedAt'])
   }
   let form = defaultsDeep(req.body, def)
@@ -22,9 +22,9 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
     req.session[`wdb${model}AddMore`] = form._addmore
     req.session[`wdb${model}ClonePrev`] = form._cloneprev
     try {
-      resp = await recordCreate({ model, req, reply, options: opts })
-      if (isEmpty(form._addmore)) return reply.redirectTo(buildUrl({ url: req.url, base: 'list', params: { page: 1 }, exclude: ['id', 'mode'] }))
-      if (isEmpty(form._cloneprev)) form = pick(form, ['_addmore', '_cloneprev'])
+      resp = await createRecord({ model, req, reply, options: opts })
+      if (!form._addmore) return reply.redirectTo(buildUrl({ url: req.url, base: 'list', params: { page: 1 }, exclude: ['id', 'mode'] }))
+      if (!form._cloneprev) form = pick(form, ['_addmore', '_cloneprev'])
     } catch (err) {
       error = err
     }
@@ -32,6 +32,7 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
     form._addmore = req.session[`wdb${model}AddMore`]
     form._cloneprev = req.session[`wdb${model}ClonePrev`]
   }
+  console.log(form)
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error, options }) : undefined
   merge(params, { form, schema, error, addOns })
   if (schema.template) template = schema.template

package/lib/crud/all-handler.js

@@ -18,7 +18,7 @@ const handler = {
 }
 
 async function allHandler ({ model, action, req, reply, template, params = {}, options = {} }) {
-  const { upperFirst, merge, keys } = this.lib._
+  const { upperFirst, merge, keys } = this.app.lib._
   if (!keys(handler).includes(action)) throw this.error('_notFound')
   if (['delete', 'export'].includes(action)) {
     if (req.method === 'GET') throw this.error('_notFound')

package/lib/crud/delete-handler.js

@@ -1,10 +1,10 @@
 async function deleteHandler ({ req, reply, model, params = {}, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
-  const { pascalCase } = this.lib.aneka
-  const { recordRemove, getSchemaExt } = this.app.waibuDb
+  const { pascalCase } = this.app.lib.aneka
+  const { removeRecord, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
-  const { reduce, merge } = this.lib._
+  const { reduce, merge } = this.app.lib._
   const opts = {}
-  model = model ?? pascalCase(req.params.model)
+  model = pascalCase(model ?? req.params.model)
   const { schema } = await getSchemaExt(model, 'add', merge({}, { params }, options))
   if (schema.disabled.includes('remove')) return await reply.view(templateDisabled, { action: 'delete' })
   opts.fields = schema.view.fields
@@ -15,9 +15,10 @@ async function deleteHandler ({ req, reply, model, params = {}, templateDisabled
     opts.noFlash = true
     for (const id of ids) {
       try {
-        await recordRemove({ model, id, req, reply, options: opts })
+        await removeRecord({ model, id, req, reply, options: opts })
         result.push(true)
       } catch (err) {
+        console.log(err)
         result.push(err.message)
       }
     }

package/lib/crud/details-handler.js

@@ -1,17 +1,17 @@
 import attachmentHandler from './helper/attachment-handler.js'
 
 async function detailsHandler ({ req, reply, model, params = {}, id, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html', options } = {}) {
-  const { pascalCase } = this.lib.aneka
-  const { recordGet, getSchemaExt } = this.app.waibuDb
-  const { merge } = this.lib._
-  const opts = { rels: '*' }
-  model = model ?? pascalCase(req.params.model)
+  const { pascalCase } = this.app.lib.aneka
+  const { getRecord, getSchemaExt } = this.app.waibuDb
+  const { merge } = this.app.lib._
+  const opts = { refs: '*' }
+  model = pascalCase(model ?? req.params.model)
   const { schema } = await getSchemaExt(model, 'details', merge({}, { params }, options))
   if (schema.disabled.includes('get')) return await reply.view(templateDisabled, { action: 'details' })
   // req.query.attachment = true
   opts.fields = schema.view.fields
   id = id ?? req.params.id ?? req.query.id
-  const resp = await recordGet({ model, req, id, options: opts })
+  const resp = await getRecord({ model, req, id, options: opts })
   const form = resp.data
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, options }) : undefined
   const attachments = await attachmentHandler.call(this, { schema, id, options })