waibu-db 1.0.16 → 1.0.18

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, reply, 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, reply, 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, reply, 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, reply, 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/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, reply, 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/bajoTemplate/partial/crud/_addons.html

@@ -0,0 +1,5 @@
+<% for (const ao of addOns) { %>
+<c:div append-to="#sb-addons" margin="bottom-3">
+  <!-- include <%= ao.resource %>|<%= JSON.stringify(ao.data) %> -->
+</c:div>
+<% } %>

package/{waibuMpa → bajoTemplate}/partial/crud/add-handler.html

@@ -1,5 +1,5 @@
 <c:form>
-  <c:include resource="waibuDb.partial:/crud/_form.html" />
+  <!-- include waibuDb.partial:/crud/_form.html -->
   <c:grid-row gutter="2" margin="top-2">
     <c:grid-col col="6-md">
       <c:wdb-btn-back />
@@ -16,4 +16,4 @@
     </c:grid-col>
   </c:grid-row>
 </c:form>
-<c:include resource="waibuDb.partial:/crud/_addons.html" />
+<!-- include waibuDb.partial:/crud/_addons.html -->

package/{waibuMpa → bajoTemplate}/partial/crud/details-handler.html

@@ -1,5 +1,5 @@
 <c:div id="main-form">
-  <c:include resource="waibuDb.partial:/crud/_form.html" />
+  <!-- include waibuDb.partial:/crud/_form.html -->
 </c:div>
 <c:grid-row gutter="2" margin="top-2">
   <c:grid-col col="6-lg">
@@ -18,4 +18,4 @@
     <c:wdb-btn-delete/>
   </c:grid-col>
 </c:grid-row>
-<c:include resource="waibuDb.partial:/crud/_addons.html" />
+<!-- include waibuDb.partial:/crud/_addons.html -->

package/{waibuMpa → bajoTemplate}/partial/crud/edit-handler.html

@@ -1,5 +1,5 @@
 <c:form id="main-form">
-  <c:include resource="waibuDb.partial:/crud/_form.html" />
+  <!-- include waibuDb.partial:/crud/_form.html -->
   <c:grid-row gutter="2" margin="top-2">
     <c:grid-col col="6-lg">
       <c:wdb-btn-back />
@@ -16,4 +16,4 @@
     </c:grid-col>
   </c:grid-row>
 </c:form>
-<c:include resource="waibuDb.partial:/crud/_addons.html" />
+<!-- include waibuDb.partial:/crud/_addons.html -->

package/{waibuMpa → bajoTemplate}/partial/crud/list-handler.html

@@ -15,5 +15,5 @@
   </c:grid-col>
 </c:grid-row>
 <c:wdb-table id="main-table" border body-divider strip responsive />
-<c:include resource="waibuDb.partial:/crud/_list-footer.html" />
-<c:include resource="waibuDb.partial:/crud/_addons.html" />
+<!-- include waibuDb.partial:/crud/_list-footer.html -->
+<!-- include waibuDb.partial:/crud/_addons.html -->

package/{waibuMpa → bajoTemplate}/template/crud/add.html

@@ -1,2 +1,2 @@
 <c:heading move-to="#fullTitle" type="5" t:content="%s - %s|<%= page.modelTitle %>|<%= _t('Add') %>" />
-<c:include resource="waibuDb.partial:/crud/add-handler.html" />
+<!-- include waibuDb.partial:/crud/add-handler.html -->

package/{waibuMpa → bajoTemplate}/template/crud/details.html

@@ -1,2 +1,2 @@
 <c:heading move-to="#fullTitle" type="5" t:content="%s - %s|<%= page.modelTitle %>|<%= _t('Details') %>" />
-<c:include resource="waibuDb.partial:/crud/details-handler.html" />
+<!-- include waibuDb.partial:/crud/details-handler.html -->

package/{waibuMpa → bajoTemplate}/template/crud/edit.html

@@ -1,2 +1,2 @@
 <c:heading move-to="#fullTitle" type="5" t:content="%s - %s|<%= page.modelTitle %>|<%= _t('Edit') %>" />
-<c:include resource="waibuDb.partial:/crud/edit-handler.html" />
+<!-- include waibuDb.partial:/crud/edit-handler.html -->

package/{waibuMpa → bajoTemplate}/template/crud/list.html

@@ -1,2 +1,2 @@
 <c:heading move-to="#fullTitle" type="5" t:content="%s - %s|<%= page.modelTitle %>|<%= _t('List') %>" />
-<c:include resource="waibuDb.partial:/crud/list-handler.html" />
+<!-- include waibuDb.partial:/crud/list-handler.html -->

package/lib/prep-crud.js

@@ -1,4 +1,4 @@
-function prepCrud ({ model, body, id, req, reply, 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._
@@ -12,6 +12,12 @@ function prepCrud ({ model, body, id, req, reply, options, args }) {
   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
@@ -21,7 +27,7 @@ function prepCrud ({ model, body, id, req, reply, 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.16",
+  "version": "1.0.18",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {

package/waibuMpa/partial/crud/_addons.html

@@ -1,5 +0,0 @@
-<% for (const ao of addOns) { %>
-<c:div append-to="#sb-addons" margin="bottom-3">
-  <c:include resource="<%= ao.resource %>" <% for (const k in ao.data) { print(k + '="' + ao.data[k] + '" ') } %>/>
-</c:div>
-<% } %>