waibu-db 1.0.15 → 1.0.17

package/bajo/method/record/count.js

@@ -2,7 +2,7 @@ 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, options, args: ['model'] })
+  const { name, opts, filter } = prepCrud.call(this, { model, req, reply, options, args: ['model'] })
   const ret = await recordCount(name, filter, opts)
   return ret
 }

package/bajo/method/record/create.js

@@ -2,9 +2,8 @@ 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 } = prepCrud.call(this, { model, req, body, options, args: ['model'] })
+  const { name, input, opts, attachment, stats, mimeType } = prepCrud.call(this, { model, req, reply, body, options, args: ['model'] })
   const ret = await recordCreate(name, input, opts)
-  const { attachment, stats, mimeType } = req.query
   if (attachment) ret.data._attachment = await attachmentFind(name, ret.data.id, { stats, mimeType })
   return ret
 }

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

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

package/bajo/method/record/find.js

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

package/bajo/method/record/get.js

@@ -3,10 +3,9 @@ import prepCrud from '../../../lib/prep-crud.js'
 async function get ({ model, req, reply, id, options = {} }) {
   const { recordGet, attachmentFind } = this.app.dobo
   const { parseFilter } = this.app.waibu
-  const { name, recId, opts } = prepCrud.call(this, { model, req, id, options, args: ['model', 'id'] })
+  const { name, recId, opts, attachment, stats, mimeType } = prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
   opts.filter = parseFilter(req)
   const ret = await recordGet(name, recId, opts)
-  const { attachment, stats, mimeType } = req.query
   if (attachment) ret.data._attachment = await attachmentFind(name, id, { stats, mimeType })
   return ret
 }

package/bajo/method/record/remove.js

@@ -2,7 +2,7 @@ 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, id, options, args: ['model', 'id'] })
+  const { name, recId, opts } = prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
   const result = await recordRemove(name, recId, opts)
   return result
 }

package/bajo/method/record/update.js

@@ -2,9 +2,8 @@ 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 } = prepCrud.call(this, { model, req, body, id, options, args: ['model', 'id'] })
+  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)
-  const { attachment, stats, mimeType } = req.query
   if (attachment) ret.data._attachment = await attachmentFind(name, id, { stats, mimeType })
   return ret
 }

package/bajo/method/stat/aggregate.js

@@ -3,7 +3,7 @@ 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, options, args: ['model'] })
+  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]
   }

package/bajo/method/stat/histogram.js

@@ -3,7 +3,7 @@ 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, options, args: ['model'] })
+  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]
   }

package/lib/prep-crud.js

@@ -1,4 +1,4 @@
-function prepCrud ({ model, body, id, req, options, args }) {
+function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
   const { parseFilter } = this.app.waibu
   const { pascalCase } = this.app.bajo
   const { cloneDeep, has } = this.app.bajo.lib._
@@ -11,6 +11,13 @@ function prepCrud ({ model, body, id, req, options, args }) {
   if (has(options, 'count')) opts.count = options.count
   opts.dataOnly = opts.dataOnly ?? false
   opts.req = req
+  opts.reply = reply
+
+  let { attachment, stats, mimeType } = opts
+  attachment = attachment ?? req.query.attachment
+  stats = stats ?? req.query.stats
+  mimeType = mimeType ?? req.query.mimeType
+
   const recId = id ?? params.id ?? req.query.id
   const name = pascalCase(model ?? params.model)
   const input = body ?? params.body
@@ -20,7 +27,7 @@ function prepCrud ({ model, body, id, req, options, args }) {
   if (options.query) filter.query = cloneDeep(options.query)
   if (options.limit) filter.limit = options.limit
   if (options.sort) filter.sort = options.sort
-  return { name, recId, input, opts, filter }
+  return { name, recId, input, opts, filter, attachment, stats, mimeType }
 }
 
 export default prepCrud

package/package.json

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