waibu-db 2.7.1 → 2.8.1

package/index.js

@@ -114,7 +114,7 @@ async function factory (pkgName) {
       })
       const omenu = groupBy(map(models, s => {
         const item = { name: s.name, ns: s.plugin.ns }
-        item.nsTitle = getPluginTitle(s.plugin.ns)
+        item.nsTitle = getPluginTitle(s.plugin.ns, req)
         return item
       }), 'nsTitle')
       const menu = []

package/lib/crud/helper/build-params.js

@@ -2,7 +2,7 @@ function buildParams ({ model, req, reply, action, options = {} }) {
   const { camelCase, kebabCase, map, upperFirst, get } = this.app.lib._
   const [, ...names] = map(kebabCase(model).split('-'), n => upperFirst(n))
   const mdl = this.app.dobo.getModel(model)
-  const prefix = this.app.waibuMpa ? this.app.waibuMpa.getPluginTitle(mdl.plugin.ns) : mdl.plugin.ns
+  const prefix = this.app.waibuMpa ? this.app.waibuMpa.getPluginTitle(mdl.plugin.ns, req) : mdl.plugin.ns
   const modelTitle = req.t(prefix) + ': ' + req.t(camelCase(names.join(' ')))
   const page = {
     title: req.t(get(req, 'routeOptions.config.title', this.app[mdl.plugin.ns].title)),

package/lib/method/count-record.js

@@ -1,9 +1,14 @@
 import { prepCrud } from '../util.js'
 
-async function countRecord ({ model, req, reply, options = {} }) {
-  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'] })
-  const ret = await mdl.countRecord(filter, opts)
-  return ret
+async function countRecord ({ model, req, reply, options = {}, transaction } = {}) {
+  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
+
+  async function handler (trx) {
+    opts.trx = opts.trx || trx
+    return await mdl.countRecord(filter, opts)
+  }
+
+  return opts.trx === true ? await mdl.transaction(handler) : await handler()
 }
 
 export default countRecord

package/lib/method/create-aggregate.js

@@ -1,13 +1,19 @@
 import { prepCrud } from '../util.js'
 
-async function createAggregate ({ model, req, reply, options = {} }) {
-  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'] })
+async function createAggregate ({ model, req, reply, options = {}, transaction } = {}) {
+  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
   const params = {}
   for (const item of ['group', 'field', 'aggregates']) {
     params[item] = options[item] ?? req.params[item] ?? req.query[item]
   }
   params.aggregates = params.aggregates ?? ['count']
-  return await mdl.createAggregate(filter, params, opts)
+
+  async function handler (trx) {
+    opts.trx = opts.trx || trx
+    return await mdl.createAggregate(filter, params, opts)
+  }
+
+  return opts.trx === true ? await mdl.transaction(handler) : await handler()
 }
 
 export default createAggregate

package/lib/method/create-histogram.js

@@ -1,13 +1,19 @@
 import { prepCrud } from '../util.js'
 
-async function createHistogram ({ model, req, reply, options = {} }) {
-  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'] })
+async function createHistogram ({ model, req, reply, options = {}, transaction } = {}) {
+  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
   const params = {}
   for (const item of ['type', 'group', 'field', 'aggregates']) {
     params[item] = options[item] ?? req.params[item] ?? req.query[item]
   }
   params.aggregates = params.aggregates ?? ['count']
-  return await mdl.createHistogram(filter, params, opts)
+
+  async function handler (trx) {
+    opts.trx = opts.trx || trx
+    return await mdl.createHistogram(filter, params, opts)
+  }
+
+  return opts.trx === true ? await mdl.transaction(handler) : await handler()
 }
 
 export default createHistogram

package/lib/method/create-record.js

@@ -1,10 +1,16 @@
 import { prepCrud } from '../util.js'
 
-async function createRecord ({ model, req, reply, body, options = {} }) {
-  const { model: mdl, input, opts, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, body, options, args: ['model'] })
-  const ret = await mdl.createRecord(input, opts)
-  if (attachment) ret.data._attachment = await mdl.findAttachment(ret.data.id, { stats, mimeType })
-  return ret
+async function createRecord ({ model, req, reply, body, options = {}, transaction } = {}) {
+  const { model: mdl, input, opts, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, body, options, args: ['model'], transaction })
+
+  async function handler (trx) {
+    if (opts.trx === true) opts.trx = trx
+    const ret = await mdl.createRecord(input, opts)
+    if (attachment) ret.data._attachment = await mdl.findAttachment(ret.data.id, { stats, mimeType })
+    return ret
+  }
+
+  return opts.trx === true ? await mdl.transaction(handler) : await handler()
 }
 
 export default createRecord

package/lib/method/find-all-record.js

@@ -1,14 +1,20 @@
 import { prepCrud } from '../util.js'
 
-async function findAllRecord ({ model, req, reply, options = {} }) {
-  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'] })
-  const ret = await mdl.findAllRecord(filter, opts)
-  if (attachment) {
-    for (const d of ret.data) {
-      d._attachment = await mdl.findAttachment(d.id, { stats, mimeType })
+async function findAllRecord ({ model, req, reply, options = {}, transaction } = {}) {
+  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
+
+  async function handler (trx) {
+    opts.trx = opts.trx || trx
+    const ret = await mdl.findAllRecord(filter, opts)
+    if (attachment) {
+      for (const d of ret.data) {
+        d._attachment = await mdl.findAttachment(d.id, { stats, mimeType })
+      }
     }
+    return ret
   }
-  return ret
+
+  return opts.trx === true ? await mdl.transaction(handler) : await handler()
 }
 
 export default findAllRecord

package/lib/method/find-one-record.js

@@ -1,14 +1,16 @@
 import { prepCrud } from '../util.js'
 
-async function findOneRecord ({ model, req, reply, options = {} }) {
-  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'] })
-  const ret = await mdl.findOneRecord(filter, opts)
-  if (attachment) {
-    for (const d of ret.data) {
-      d._attachment = await mdl.findAttachment(d.id, { stats, mimeType })
-    }
+async function findOneRecord ({ model, req, reply, options = {}, transaction } = {}) {
+  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
+
+  async function handler (trx) {
+    opts.trx = opts.trx || trx
+    const ret = await mdl.findOneRecord(filter, opts)
+    if (attachment) ret.data._attachment = await mdl.findAttachment(ret.data.id, { stats, mimeType })
+    return ret
   }
-  return ret
+
+  return opts.trx === true ? await mdl.transaction(handler) : await handler()
 }
 
 export default findOneRecord

package/lib/method/find-record.js

@@ -1,14 +1,20 @@
 import { prepCrud } from '../util.js'
 
-async function findRecord ({ model, req, reply, options = {} }) {
-  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'] })
-  const ret = await mdl.findRecord(filter, opts)
-  if (attachment) {
-    for (const d of ret.data) {
-      d._attachment = await mdl.findAttachment(d.id, { stats, mimeType })
+async function findRecord ({ model, req, reply, options = {}, transaction } = {}) {
+  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
+
+  async function handler (trx) {
+    opts.trx = opts.trx || trx
+    const ret = await mdl.findRecord(filter, opts)
+    if (attachment) {
+      for (const d of ret.data) {
+        d._attachment = await mdl.findAttachment(d.id, { stats, mimeType })
+      }
     }
+    return ret
   }
-  return ret
+
+  return opts.trx === true ? await mdl.transaction(handler) : await handler()
 }
 
 export default findRecord

package/lib/method/get-record.js

@@ -1,9 +1,17 @@
 import { prepCrud, getOneRecord } from '../util.js'
 
-async function getRecord ({ model, req, reply, id, options = {} }) {
-  const { model: mdl, recId, filter, opts } = await prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
-  const data = await getOneRecord.call(this, mdl, recId, filter, opts)
-  return options.dataOnly ? data : { data }
+async function getRecord ({ model, req, reply, id, options = {}, transaction } = {}) {
+  const { model: mdl, recId, filter, attachment, stats, mimeType, opts } = await prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'], transaction })
+  const me = this
+
+  async function handler (trx) {
+    opts.trx = opts.trx || trx
+    const data = await getOneRecord.call(me, mdl, recId, filter, opts)
+    if (attachment) data._attachment = await mdl.findAttachment(data.id, { stats, mimeType })
+    return { data }
+  }
+
+  return opts.trx === true ? await mdl.transaction(handler) : await handler()
 }
 
 export default getRecord

package/lib/method/remove-record.js

@@ -1,10 +1,16 @@
 import { prepCrud, getOneRecord } from '../util.js'
 
-async function removeRecord ({ model, req, reply, id, options = {} }) {
-  const { model: mdl, recId, opts, filter } = await prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
-  opts._data = await getOneRecord.call(this, mdl, recId, filter, options)
-  const result = await mdl.removeRecord(recId, opts)
-  return result
+async function removeRecord ({ model, req, reply, id, options = {}, transaction } = {}) {
+  const { model: mdl, recId, opts, filter } = await prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'], transaction })
+  const me = this
+
+  async function handler (trx) {
+    opts.trx = opts.trx || trx
+    opts._data = await getOneRecord.call(me, mdl, recId, filter, opts)
+    return await mdl.removeRecord(recId, opts)
+  }
+
+  return opts.trx === true ? await mdl.transaction(handler) : await handler()
 }
 
 export default removeRecord

package/lib/method/update-record.js

@@ -1,11 +1,18 @@
 import { prepCrud, getOneRecord } from '../util.js'
 
-async function updateRecord ({ model, req, reply, id, body, options = {} }) {
-  const { model: mdl, filter, input, opts, recId, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, body, id, options, args: ['model', 'id'] })
-  opts._data = await getOneRecord.call(this, mdl, recId, filter, options)
-  const ret = await mdl.updateRecord(recId, input, opts)
-  if (attachment) ret.data._attachment = await mdl.findAttachment(id, { stats, mimeType })
-  return ret
+async function updateRecord ({ model, req, reply, id, body, options = {}, transaction } = {}) {
+  const { model: mdl, filter, input, opts, recId, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, body, id, options, args: ['model', 'id'], transaction })
+  const me = this
+
+  async function handler (trx) {
+    opts.trx = opts.trx || trx
+    opts._data = await getOneRecord.call(me, mdl, recId, filter, opts)
+    const ret = await mdl.updateRecord(recId, input, opts)
+    if (attachment) ret.data._attachment = await mdl.findAttachment(id, { stats, mimeType })
+    return ret
+  }
+
+  return opts.trx === true ? await mdl.transaction(handler) : await handler()
 }
 
 export default updateRecord

package/lib/util.js

@@ -1,14 +1,15 @@
-export async function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
+export async function prepCrud ({ model, body, id, req, reply, transaction, options = {}, args } = {}) {
   const { isSet } = this.app.lib.aneka
   const { importModule } = this.app.bajo
   const { parseFilter } = this.app.waibu
   const { pascalCase } = this.app.lib.aneka
-  const { cloneDeep, has, isString } = this.app.lib._
+  const { cloneDeep, has, isString, omit } = this.app.lib._
   const { parseObject } = this.app.lib
   const { buildFilterQuery, buildFilterSearch } = await importModule('dobo:/lib/factory/model/_util.js', { asDefaultImport: false })
 
   const cfgWeb = this.app.waibu.getConfig()
-  const opts = cloneDeep(options)
+  const opts = cloneDeep(omit(options, ['trx']))
+  opts.trx = options.trx
   const params = this.getParams(req, ...args)
   for (const k of ['count', 'fields']) {
     opts[k] = opts[k] ?? params[k]
@@ -17,6 +18,7 @@ export async function prepCrud ({ model, body, id, req, reply, options = {}, arg
   opts.dataOnly = opts.dataOnly ?? false
   opts.req = req
   opts.reply = reply
+  opts.trx = opts.trx || transaction
 
   let { attachment, stats, mimeType } = opts
   attachment = attachment ?? req.query.attachment
@@ -53,9 +55,9 @@ export async function prepCrud ({ model, body, id, req, reply, options = {}, arg
 
 export async function getOneRecord (model, id, filter, options) {
   const { cloneDeep } = this.app.lib._
-  let query = cloneDeep(filter.query)
-  query = { $and: [query ?? {}, { id }] }
-  const data = await model.findOneRecord({ query }, { dataOnly: true, noHook: true, noDynHook: true, noModelHook: true, forceNoHidden: options.forceNoHidden })
+  let query = cloneDeep(filter.query || {})
+  query = { $and: [query, { id }] }
+  const data = await model.findOneRecord({ query }, { dataOnly: true, noHook: true, noDynHook: true, noModelHook: true, forceNoHidden: options.forceNoHidden, trx: options.trx })
   if (!data && options.throwNotFound) throw this.error('_notFound')
   return data
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-db",
-  "version": "2.7.1",
+  "version": "2.8.1",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,22 +1,30 @@
 # Changes
 
+## 2026-03-08
+
+- [2.8.1] Bug fix in ```build-params.js```
+
+## 2026-03-05
+
+- [2.8.0] Add dobo's transaction support
+
 ## 2026-02-22
 
-- [2.7.1] Bug fix on query parser
+- [2.7.1] Bug fix in query parser
 
 ## 2026-02-20
 
 - [2.7.0] Update ```WdbBtnColumns``` to allow untick ID field too
-- [2.7.0] Bug fix on theme & iconset resolver
+- [2.7.0] Bug fix in theme & iconset resolver
 - [2.7.0] Add capability to set value from ```prop.values``` in ```WdbTable```
-- [2.7.0] Bug fix on query builder
+- [2.7.0] Bug fix in query builder
 - [2.7.0] Add capability to handle value from ```prop.values``` in ```getSchemaExt()```
 
 ## 2026-02-18
 
 - [2.6.0] Update attribute functions from ```waibu```
-- [2.6.0] Bug fix on ```getSchemaExt()```'s ```applyLayout()```
-- [2.6.1] Bug fix on ```getSchemaExt()```
+- [2.6.0] Bug fix in ```getSchemaExt()```'s ```applyLayout()```
+- [2.6.1] Bug fix in ```getSchemaExt()```
 
 ## 2026-02-15
 
@@ -28,14 +36,14 @@
 
 ## 2026-02-04
 
-- [2.3.2] Bug fix on ```detailsHandler()```
-- [2.3.2] Bug fix on ```getOneRecord()```
-- [2.3.3] Bug fix on calling ```getOneRecord()``` without scope
+- [2.3.2] Bug fix in ```detailsHandler()```
+- [2.3.2] Bug fix in ```getOneRecord()```
+- [2.3.3] Bug fix in calling ```getOneRecord()``` without scope
 
 ## 2026-02-03
 
-- [2.3.1] Bug fix on widget menu direction
-- [2.3.1] Bug fix on widget's fields visibility
+- [2.3.1] Bug fix in widget menu direction
+- [2.3.1] Bug fix in widget's fields visibility
 
 ## 2026-01-30
 
@@ -53,11 +61,11 @@
 
 ## 2026-01-21
 
-- [2.1.7] Bug fix on page titles
+- [2.1.7] Bug fix in page titles
 
 ## 2026-01-19
 
-- [2.1.6] Bug fix on app title
+- [2.1.6] Bug fix in app title
 - [2.1.6] Add some missing translations
 
 ## 2026-01-17
@@ -67,11 +75,11 @@
 
 ## 2026-01-16
 
-- [2.1.2] Bug fix on model references
+- [2.1.2] Bug fix in model references
 
 ## 2026-01-13
 
-- [2.1.1] Bug fix on waibuMpa's widgeting system
+- [2.1.1] Bug fix in waibuMpa's widgeting system
 
 ## 2025-12-28