waibu-db 2.0.1 → 2.1.1

package/lib/crud/helper/attachment-handler.js

@@ -1,7 +1,7 @@
 async function attachmentHandler ({ schema, id, options = {} }) {
-  const { listAttachments } = this.app.dobo
   if (!schema.view.attachment) return []
-  return await listAttachments({ model: schema.name, id })
+  const model = this.app.dobo.getModel(schema.name)
+  return await model.listAttachment({ id })
 }
 
 export default attachmentHandler

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

@@ -1,11 +1,10 @@
 function buildParams ({ model, req, reply, action, options = {} }) {
   const { camelCase, kebabCase, map, upperFirst, get } = this.app.lib._
-  const { getSchema } = this.app.dobo
   const [, ...names] = map(kebabCase(model).split('-'), n => upperFirst(n))
-  const schema = getSchema(camelCase(model), false)
-  const modelTitle = this.app[schema.ns].title + ': ' + req.t(camelCase(names.join(' ')))
+  const mdl = this.app.dobo.getModel(model)
+  const modelTitle = this.app[mdl.plugin.ns].title + ': ' + req.t(camelCase(names.join(' ')))
   const page = {
-    title: req.t(get(req, 'routeOptions.config.title', this.app[schema.ns].title)),
+    title: req.t(get(req, 'routeOptions.config.title', this.app[mdl.plugin.ns].title)),
     modelTitle
   }
   return { page }

package/lib/crud/list-handler.js

@@ -1,9 +1,9 @@
 async function listHandler ({ req, reply, model, template, params = {}, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
   const { pascalCase } = this.app.lib.aneka
-  const { recordFind, getSchemaExt } = this.app.waibuDb
+  const { findRecord, getSchemaExt } = this.app.waibuDb
   const { get, merge, isArray, upperFirst } = this.app.lib._
   const qsKey = this.app.waibu.config.qsKey
-  model = model ?? pascalCase(req.params.model)
+  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' })
   for (const key of ['sort', 'limit', 'fields']) {
@@ -13,7 +13,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 recordFind({ model, req, options: { count: true, rels: '*' } })
+  const list = await findRecord({ model, req, options: { count: true, refs: '*' } })
   let addOns = []
   if (addOnsHandler) {
     addOns = await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: list, schema, options })

package/lib/method/count-record.js

@@ -0,0 +1,9 @@
+import prepCrud from '../prep-crud.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
+}
+
+export default countRecord

package/lib/method/create-aggregate.js

@@ -0,0 +1,13 @@
+import prepCrud from '../prep-crud.js'
+
+async function createAggregate ({ model, req, reply, options = {} }) {
+  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'] })
+  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)
+}
+
+export default createAggregate

package/lib/method/create-histogram.js

@@ -0,0 +1,13 @@
+import prepCrud from '../prep-crud.js'
+
+async function createHistogram ({ model, req, reply, options = {} }) {
+  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'] })
+  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)
+}
+
+export default createHistogram

package/lib/method/create-record.js

@@ -0,0 +1,10 @@
+import prepCrud from '../prep-crud.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
+}
+
+export default createRecord

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

@@ -0,0 +1,14 @@
+import prepCrud from '../prep-crud.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 })
+    }
+  }
+  return ret
+}
+
+export default findOneRecord

package/lib/method/find-record.js

@@ -0,0 +1,14 @@
+import prepCrud from '../prep-crud.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 })
+    }
+  }
+  return ret
+}
+
+export default findRecord

package/lib/method/get-record.js

@@ -0,0 +1,10 @@
+import prepCrud from '../prep-crud.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'] })
+  filter.query = { $and: [filter.query ?? {}, { id: recId }] }
+  const ret = await mdl.findOneRecord(filter, opts)
+  return ret
+}
+
+export default getRecord

package/{method → lib/method}/get-schema-ext.js

@@ -167,19 +167,18 @@ const handler = {
   }
 }
 
-async function getSchemaExt (model, view, options = {}) {
+async function getSchemaExt (modelName, view, options = {}) {
   const { readConfig } = this.app.bajo
   const { defaultsDeep } = this.app.lib.aneka
-  const { getSchema } = this.app.dobo
   const { pick } = this.app.lib._
 
-  let schema = getSchema(model)
-  const base = path.basename(schema.file, path.extname(schema.file))
-  let ext = await readConfig(`${schema.ns}:/extend/waibuDb/schema/${base}.*`, { ignoreError: true, options })
-  const over = await readConfig(`main:/extend/waibuDb/extend/${schema.ns}/schema/${base}.*`, { ignoreError: true, options })
+  const model = this.app.dobo.getModel(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 })
+  const over = await readConfig(`main:/extend/waibuDb/extend/${model.plugin.ns}/schema/${base}.*`, { ignoreError: true, options })
   ext = defaultsDeep(options.schema ?? {}, over, ext)
   await handler[view].call(this, schema, ext, options)
-  schema = pick(schema, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'view'])
   return { schema, ext }
 }
 

package/lib/method/remove-record.js

@@ -0,0 +1,9 @@
+import prepCrud from '../prep-crud.js'
+
+async function removeRecord ({ model, req, reply, id, options = {} }) {
+  const { model: mdl, recId, opts } = await prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
+  const result = await mdl.removeRecord(recId, opts)
+  return result
+}
+
+export default removeRecord

package/lib/method/update-record.js

@@ -0,0 +1,10 @@
+import prepCrud from '../prep-crud.js'
+
+async function updateRecord ({ model, req, reply, id, body, options = {} }) {
+  const { model: mdl, input, opts, recId, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, body, id, options, args: ['model', 'id'] })
+  const ret = await mdl.updateRecord(recId, input, opts)
+  if (attachment) ret.data._attachment = await mdl.findAttachment(id, { stats, mimeType })
+  return ret
+}
+
+export default updateRecord

package/lib/prep-crud.js

@@ -1,8 +1,7 @@
-function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
+async function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
   const { parseFilter } = this.app.waibu
-  const { buildQuery, getInfo } = this.app.dobo
   const { pascalCase } = this.app.lib.aneka
-  const { cloneDeep, has } = this.app.lib._
+  const { cloneDeep, has, pick } = this.app.lib._
   const cfgWeb = this.app.waibu.getConfig()
   const opts = cloneDeep(options)
   const params = this.getParams(req, ...args)
@@ -20,18 +19,18 @@ function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
   mimeType = mimeType ?? req.query.mimeType
 
   const recId = id ?? params.id ?? req.query.id
-  const name = pascalCase(model ?? params.model)
-  const { schema } = getInfo(name)
-  const input = body ?? params.body
+  model = model ?? pascalCase(params.model)
+  const 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]
   opts.bboxLngField = req.query[cfgWeb.qsKey.bboxLngField]
-  const filter = parseFilter(req)
+  const filter = pick(parseFilter(req), ['query', 'match', 'limit', 'sort', 'page', 'skip'])
   if (options.query) filter.query = cloneDeep(options.query)
   if (options.limit) filter.limit = options.limit
   if (options.sort) filter.sort = options.sort
   if (options.page) filter.page = options.page
-  filter.query = buildQuery({ filter, schema })
-  return { name, recId, input, opts, filter, attachment, stats, mimeType }
+  return { model: mdl, recId, input, opts, filter, attachment, stats, mimeType }
 }
 
 export default prepCrud

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-db",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,13 @@
   },
   "type": "module",
   "bajo": {
-    "type": "plugin"
+    "type": "plugin",
+    "alias": "wdb",
+    "dependencies": [
+      "dobo",
+      "waibu",
+      "dobo-extra"
+    ]
   },
   "repository": {
     "type": "git",

package/wiki/CHANGES.md

@@ -0,0 +1,9 @@
+# Changes
+
+## 2026-01-13
+
+- [2.1.1] Bug fix on waibuMpa's widgeting system
+
+## 2025-12-28
+
+- [2.1.0] Ported to ```bajo@2.2.x``` & ```dobo@2.2.x``` specs

package/method/format-record.js

@@ -1,41 +0,0 @@
-async function formatRow ({ 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
-}
-
-async function formatRecord ({ data, req, schema, options = {} }) {
-  const { isArray } = this.app.lib._
-  if (!isArray(data)) return await formatRow.call(this, { data, req, schema, options })
-  const items = []
-  for (const d of data) {
-    const item = await formatRow.call(this, { data: d, req, schema, options })
-    items.push(item)
-  }
-  return items
-}
-
-export default formatRecord

package/method/get-lookup-data.js

@@ -1,13 +0,0 @@
-async function getLookupData ({ 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.recordFind({ model, req, options })
-}
-
-export default getLookupData

package/method/get-params.js

@@ -1,18 +0,0 @@
-function 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
-}
-
-export default getParams

package/method/method-map.js

@@ -1,9 +0,0 @@
-const methodMap = {
-  create: 'POST',
-  find: 'GET',
-  get: 'GET',
-  update: 'PUT',
-  remove: 'DELETE'
-}
-
-export default methodMap

package/method/record/count.js

@@ -1,10 +0,0 @@
-import prepCrud from '../../lib/prep-crud.js'
-
-async function count ({ model, req, reply, options = {} }) {
-  const { recordCount } = this.app.dobo
-  const { name, opts, filter } = prepCrud.call(this, { model, req, reply, options, args: ['model'] })
-  const ret = await recordCount(name, filter, opts)
-  return ret
-}
-
-export default count

package/method/record/create.js

@@ -1,11 +0,0 @@
-import prepCrud from '../../lib/prep-crud.js'
-
-async function create ({ model, req, reply, body, options = {} }) {
-  const { recordCreate, attachmentFind } = this.app.dobo
-  const { name, input, opts, attachment, stats, mimeType } = prepCrud.call(this, { model, req, reply, body, options, args: ['model'] })
-  const ret = await recordCreate(name, input, opts)
-  if (attachment) ret.data._attachment = await attachmentFind(name, ret.data.id, { stats, mimeType })
-  return ret
-}
-
-export default create

package/method/record/find-one.js

@@ -1,15 +0,0 @@
-import prepCrud from '../../lib/prep-crud.js'
-
-async function find ({ model, req, reply, options = {} }) {
-  const { recordFindOne, attachmentFind } = this.app.dobo
-  const { name, opts, filter, attachment, stats, mimeType } = prepCrud.call(this, { model, req, reply, options, args: ['model'] })
-  const ret = await recordFindOne(name, filter, opts)
-  if (attachment) {
-    for (const d of ret.data) {
-      d._attachment = await attachmentFind(name, d.id, { stats, mimeType })
-    }
-  }
-  return ret
-}
-
-export default find

package/method/record/find.js

@@ -1,15 +0,0 @@
-import prepCrud from '../../lib/prep-crud.js'
-
-async function find ({ model, req, reply, options = {} }) {
-  const { recordFind, attachmentFind } = this.app.dobo
-  const { name, opts, filter, attachment, stats, mimeType } = prepCrud.call(this, { model, req, reply, options, args: ['model'] })
-  const ret = await recordFind(name, filter, opts)
-  if (attachment) {
-    for (const d of ret.data) {
-      d._attachment = await attachmentFind(name, d.id, { stats, mimeType })
-    }
-  }
-  return ret
-}
-
-export default find

package/method/record/get.js

@@ -1,11 +0,0 @@
-import prepCrud from '../../lib/prep-crud.js'
-
-async function get ({ model, req, reply, id, options = {} }) {
-  const { recordFindOne } = this.app.dobo
-  const { name, recId, filter, opts } = prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
-  filter.query = { $and: [filter.query ?? {}, { id: recId }] }
-  const ret = await recordFindOne(name, filter, opts)
-  return ret
-}
-
-export default get

package/method/record/remove.js

@@ -1,10 +0,0 @@
-import prepCrud from '../../lib/prep-crud.js'
-
-async function remove ({ model, req, reply, id, options = {} }) {
-  const { recordRemove } = this.app.dobo
-  const { name, recId, opts } = prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
-  const result = await recordRemove(name, recId, opts)
-  return result
-}
-
-export default remove

package/method/record/update.js

@@ -1,11 +0,0 @@
-import prepCrud from '../../lib/prep-crud.js'
-
-async function update ({ model, req, reply, id, body, options = {} }) {
-  const { recordUpdate, attachmentFind } = this.app.dobo
-  const { name, input, opts, recId, attachment, stats, mimeType } = prepCrud.call(this, { model, req, reply, body, id, options, args: ['model', 'id'] })
-  const ret = await recordUpdate(name, recId, input, opts)
-  if (attachment) ret.data._attachment = await attachmentFind(name, id, { stats, mimeType })
-  return ret
-}
-
-export default update

package/method/stat/aggregate.js

@@ -1,14 +0,0 @@
-import prepCrud from '../../lib/prep-crud.js'
-
-async function aggregate ({ model, req, reply, options = {} }) {
-  const { statAggregate } = this.app.dobo
-  const { parseFilter } = this.app.waibu
-  const { name, opts } = prepCrud.call(this, { model, req, reply, options, args: ['model'] })
-  for (const item of ['group', 'aggregate']) {
-    opts[item] = options[item] ?? req.params[item] ?? req.query[item]
-  }
-  opts.aggregate = opts.aggregate ?? 'count'
-  return await statAggregate(name, parseFilter(req), opts)
-}
-
-export default aggregate

package/method/stat/histogram.js

@@ -1,14 +0,0 @@
-import prepCrud from '../../lib/prep-crud.js'
-
-async function histogram ({ model, req, reply, options = {} }) {
-  const { statHistogram } = this.app.dobo
-  const { parseFilter } = this.app.waibu
-  const { name, opts } = prepCrud.call(this, { model, req, reply, options, args: ['model'] })
-  for (const item of ['type', 'group', 'aggregate']) {
-    opts[item] = options[item] ?? req.params[item] ?? req.query[item]
-  }
-  opts.aggregate = opts.aggregate ?? 'count'
-  return await statHistogram(name, parseFilter(req), opts)
-}
-
-export default histogram