waibu-db 2.1.6 → 2.2.0

package/index.js

@@ -96,7 +96,7 @@ async function factory (pkgName) {
     adminMenu = async (locals, req) => {
       const { getPluginPrefix } = this.app.waibu
       const { pascalCase } = this.app.lib.aneka
-      const { getAppTitle } = this.app.waibuMpa
+      const { getPluginTitle } = this.app.waibuMpa
       const { camelCase, map, groupBy, keys, kebabCase, filter, get, isArray } = this.app.lib._
 
       const prefix = getPluginPrefix(this.ns)
@@ -112,7 +112,7 @@ async function factory (pkgName) {
       })
       const omenu = groupBy(map(models, s => {
         const item = { name: s.name, ns: s.plugin.ns }
-        item.nsTitle = getAppTitle(s.plugin.ns)
+        item.nsTitle = getPluginTitle(s.plugin.ns)
         return item
       }), 'nsTitle')
       const menu = []

package/lib/crud/add-handler.js

@@ -4,7 +4,7 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
   const { buildUrl } = this.app.waibuMpa
   const { defaultsDeep } = this.app.lib.aneka
   const { pick, map, merge, omit } = this.app.lib._
-  const opts = {}
+  const opts = merge({}, options.modelOpts)
   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' })

package/lib/crud/delete-handler.js

@@ -3,7 +3,7 @@ async function deleteHandler ({ req, reply, model, params = {}, templateDisabled
   const { removeRecord, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
   const { reduce, merge } = this.app.lib._
-  const opts = {}
+  const opts = merge({}, options.modelOpts)
   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' })

package/lib/crud/details-handler.js

@@ -4,7 +4,7 @@ async function detailsHandler ({ req, reply, model, params = {}, id, template, a
   const { pascalCase } = this.app.lib.aneka
   const { getRecord, getSchemaExt } = this.app.waibuDb
   const { merge } = this.app.lib._
-  const opts = { refs: '*' }
+  const opts = merge({ refs: '*' }, options.modelOpts)
   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' })

package/lib/crud/edit-handler.js

@@ -8,7 +8,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   const { fs } = this.app.lib
   const { defaultsDeep } = this.app.lib.aneka
   const { merge, isEmpty, omit } = this.app.lib._
-  const opts = {}
+  const opts = merge({}, options.modelOpts)
   let error
   let resp
   let form

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.getAppTitle(mdl.plugin.ns) : mdl.plugin.ns
+  const prefix = this.app.waibuMpa ? this.app.waibuMpa.getPluginTitle(mdl.plugin.ns) : 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/crud/list-handler.js

@@ -3,6 +3,8 @@ async function listHandler ({ req, reply, model, template, params = {}, addOnsHa
   const { findRecord, getSchemaExt } = this.app.waibuDb
   const { get, merge, isArray, upperFirst } = this.app.lib._
   const qsKey = this.app.waibu.config.qsKey
+
+  const opts = merge({}, { count: true, refs: '*' }, options.modelOpts)
   model = pascalCase(model ?? req.params.model)
   const { schema } = await getSchemaExt(model, 'list', merge({}, { params }, options))
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
@@ -13,7 +15,7 @@ async function listHandler ({ req, reply, model, template, params = {}, addOnsHa
   }
   if (!req.query[qsKey.page]) req.query[qsKey.page] = 1
   // req.query.attachment = true
-  const list = await findRecord({ model, req, options: { count: true, refs: '*' } })
+  const list = await findRecord({ model, req, options: opts })
   let addOns = []
   if (addOnsHandler) {
     addOns = await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: list, schema, options })

package/lib/method/get-schema-ext.js

@@ -170,9 +170,9 @@ const handler = {
 async function getSchemaExt (modelName, view, options = {}) {
   const { readConfig } = this.app.bajo
   const { defaultsDeep } = this.app.lib.aneka
-  const { pick } = this.app.lib._
+  const { pick, isString } = this.app.lib._
 
-  const model = this.app.dobo.getModel(modelName)
+  const model = isString(modelName) ? this.app.dobo.getModel(modelName) : modelName
   const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'view', 'hidden'])
   const base = path.basename(model.file, path.extname(model.file))
   let ext = await readConfig(`${model.plugin.ns}:/extend/waibuDb/schema/${base}.*`, { ignoreError: true, options })

package/lib/prep-crud.js

@@ -2,7 +2,7 @@ async function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
   const { isSet } = this.app.lib.aneka
   const { parseFilter } = this.app.waibu
   const { pascalCase } = this.app.lib.aneka
-  const { cloneDeep, has } = this.app.lib._
+  const { cloneDeep, has, isString } = this.app.lib._
   const { parseObject } = this.app.lib
   const cfgWeb = this.app.waibu.getConfig()
   const opts = cloneDeep(options)
@@ -28,8 +28,11 @@ async function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
   if (refs.length > 0) options.refs = refs
 
   const recId = id ?? params.id ?? req.query.id
-  model = model ?? pascalCase(params.model)
-  const mdl = this.app.dobo.getModel(model)
+  let mdl = model
+  if (isString(model)) {
+    model = model ?? pascalCase(params.model)
+    mdl = this.app.dobo.getModel(model)
+  }
   const input = await mdl.sanitizeBody({ body: body ?? params.body, partial: true, strict: true })
 
   opts.bboxLatField = req.query[cfgWeb.qsKey.bboxLatField]

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-01-24
+
+- [2.2.0] Model's option can now be sent through ```modelOpts``` object in ```options``` handler
+- [2.2.0] ```prepCrud()``` now accept model instance or model name only
+- [2.2.0] ```getSchemaExt``` now accept model instance or model name only
+
+## 2026-01-21
+
+- [2.1.7] Bug fix on page titles
+
 ## 2026-01-19
 
 - [2.1.6] Bug fix on app title