waibu-db 1.2.1 → 1.2.3

package/README.md

@@ -18,6 +18,10 @@ $ npm install waibu-db
 
 Now open your ```<bajo-data-dir>/config/.plugins``` and put ```waibu-db``` in it
 
+## Configuration
+
+- ```modelRestApi```: set to ```true``` to enable the auto creation of model's rest API. default: ```false```
+
 ## License
 
 [MIT](LICENSE)

package/bajo/hook/waibu-rest-api@after-init.js

@@ -0,0 +1,10 @@
+async function afterInit () {
+  if (!this.config.modelRestApi) {
+    this.app.waibuRestApi.config.disabled.push(
+      'waibuDb:/:model',
+      'waibuDb:/:model/:id'
+    )
+  }
+}
+
+export default afterInit

package/index.js

@@ -21,7 +21,8 @@ async function factory (pkgName) {
         dbModel: {
           count: false,
           patchEnabled: false
-        }
+        },
+        modelRestApi: false
       }
     }
   }

package/lib/crud/add-handler.js

@@ -7,7 +7,7 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
   const options = {}
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'add', { params })
-  if (schema.disabled.includes('create')) return reply.view(templateDisabled, { action: 'add' })
+  if (schema.disabled.includes('create')) return await reply.view(templateDisabled, { action: 'add' })
   // req.query.attachment = true
   options.fields = schema.view.fields
   let def = {}
@@ -34,7 +34,7 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
   }
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error }) : undefined
   merge(params, { form, schema, error, addOns })
-  return reply.view(template, params)
+  return await reply.view(template, params)
 }
 
 export default addHandler

package/lib/crud/delete-handler.js

@@ -6,7 +6,7 @@ async function deleteHandler ({ req, reply, model, params = {}, templateDisabled
   const options = {}
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'add', { params })
-  if (schema.disabled.includes('remove')) return reply.view(templateDisabled, { action: 'delete' })
+  if (schema.disabled.includes('remove')) return await reply.view(templateDisabled, { action: 'delete' })
   options.fields = schema.view.fields
   const ids = (req.body.ids ?? '').split(',')
   if (ids.length > 0) {

package/lib/crud/details-handler.js

@@ -7,7 +7,7 @@ async function detailsHandler ({ req, reply, model, params = {}, id, template, a
   const options = {}
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'details', { params })
-  if (schema.disabled.includes('get')) return reply.view(templateDisabled, { action: 'details' })
+  if (schema.disabled.includes('get')) return await reply.view(templateDisabled, { action: 'details' })
   // req.query.attachment = true
   options.fields = schema.view.fields
   id = id ?? req.params.id ?? req.query.id
@@ -16,7 +16,7 @@ async function detailsHandler ({ req, reply, model, params = {}, id, template, a
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema }) : undefined
   const attachments = await attachmentHandler.call(this, { schema, id })
   merge(params, { form, schema, addOns, attachments })
-  return reply.view(template, params)
+  return await reply.view(template, params)
 }
 
 export default detailsHandler

package/lib/crud/edit-handler.js

@@ -14,7 +14,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   let form
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'edit', options, { params })
-  if (schema.disabled.includes('update')) return reply.view(templateDisabled, { action: 'edit' })
+  if (schema.disabled.includes('update')) return await reply.view(templateDisabled, { action: 'edit' })
   // req.query.attachment = true
   options.fields = schema.view.fields
   id = id ?? req.params.id ?? req.query.id
@@ -45,7 +45,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error }) : undefined
   const attachments = await attachmentHandler.call(this, { schema, id })
   merge(params, { form, schema, error, addOns, attachments })
-  return reply.view(template, params)
+  return await reply.view(template, params)
 }
 
 export default editHandler

package/lib/crud/export-handler.js

@@ -5,7 +5,7 @@ async function exportHandler ({ req, reply, model, params = {}, templateDisabled
   const options = {}
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'add', options, { params })
-  if (schema.disabled.includes('find')) return reply.view(templateDisabled, { action: 'list' })
+  if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
   options.fields = schema.view.fields
   const url = buildUrl({ url: req.url, base: req.body.handler })
   req.flash('notify', req.t('Data export in queue. You\'ll be notified once completed'))

package/lib/crud/list-handler.js

@@ -6,7 +6,7 @@ async function listHandler ({ req, reply, model, template, params = {}, addOnsHa
   const options = { count: true, rels: '*' }
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'list', { params })
-  if (schema.disabled.includes('find')) return reply.view(templateDisabled, { action: 'list' })
+  if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
   for (const key of ['sort', 'limit', 'fields']) {
     const sessKey = `wdb${model}${upperFirst(key)}`
     if (!req.query[qsKey[key]]) req.query[qsKey[key]] = req.session[sessKey] ?? get(schema, `view.qs.${key}`)
@@ -21,7 +21,7 @@ async function listHandler ({ req, reply, model, template, params = {}, addOnsHa
     if (!isArray(addOns)) addOns = [addOns]
   }
   merge(params, { list, schema, addOns })
-  return reply.view(template, params)
+  return await reply.view(template, params)
 }
 
 export default listHandler

package/package.json

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

package/waibuRestApi/route/@model/@id/get.js

@@ -0,0 +1,5 @@
+async function get (req, reply) {
+  return await this.recordGet({ req, reply })
+}
+
+export default get

package/waibuRestApi/route/@model/@id/remove.js

@@ -0,0 +1,5 @@
+async function remove (req, reply) {
+  return await this.recordRemove({ req, reply })
+}
+
+export default remove

package/waibuRestApi/route/@model/@id/update.js

@@ -0,0 +1,5 @@
+async function update (req, reply) {
+  return await this.recordUpdate({ req, reply })
+}
+
+export default update

package/waibuRestApi/route/@model/create.js

@@ -0,0 +1,5 @@
+async function create (req, reply) {
+  return await this.recordCreate({ req, reply })
+}
+
+export default create

package/waibuRestApi/route/@model/find.js

@@ -0,0 +1,14 @@
+async function find (req, reply) {
+  const { isSet } = this.lib.aneka
+  const { parseObject } = this.app.bajo
+  let { fields, count } = this.getParams(req)
+  let rels = []
+  const headers = parseObject(req.headers, { parseValue: true })
+  if (isSet(headers['x-count'])) count = headers['x-count']
+  if (isSet(headers['x-rels'])) rels = headers['x-rels']
+  if (typeof rels === 'string' && !['*', 'all'].includes(rels)) rels = [rels]
+  const options = { fields, count, rels }
+  return await this.recordFind({ req, reply, options })
+}
+
+export default find