dobo 2.6.6 → 2.8.0

package/extend/bajo/intl/en-US.json

@@ -145,6 +145,9 @@
   "inMemoryDb%s%s": "'%s' is an in-memory database, %s is not allowed",
   "buildOp": "'build' operation",
   "dropOp": "'drop' operation",
+  "maxLimitWarning%s%s": "Records per page (%s rows) above the allowed threshold (%s rows)",
+  "hardLimitWarning%s%s": "Max records returned (%s rows) above the allowed threshold (%s rows)",
+  "maxPageError%s%s": "Page number (%s) above the allowed threshold (%s)",
   "field": {
     "id": "ID",
     "code": "Kode",

package/extend/bajo/intl/id.json

@@ -143,6 +143,9 @@
   "inMemoryDb%s%s": "'%s' adalah database in-memory, %s tidak diizinkan",
   "buildOp": "operasi 'build'",
   "dropOp": "operasi 'drop'",
+  "maxLimitWarning%s": "Data per halaman (%s baris) melampaui batas yang diijinkan (%s baris)",
+  "hardLimitWarning%s": "Maksimum data yang dihasilkan (%s baris) melampaui batas yang diijinkan (%s baris)",
+  "maxPageError%s%s": "Nomor halaman (%s) melampaui batas yang diijinkan (%s)",
   "field": {
     "id": "ID",
     "code": "Kode",

package/index.js

@@ -81,7 +81,7 @@ const propertyType = {
   }
 }
 
-const commonPropertyTypes = ['name', 'type', 'required', 'rules', 'validator', 'ref', 'default']
+const commonPropertyTypes = ['name', 'type', 'required', 'rules', 'validator', 'ref', 'default', 'values', 'rulesMsg']
 
 /**
  * Plugin factory
@@ -151,6 +151,7 @@ async function factory (pkgName) {
             limit: 25,
             maxLimit: 200,
             hardLimit: 10000,
+            maxPage: 50,
             sort: ['dt:-1', 'updatedAt:-1', 'updated_at:-1', 'createdAt:-1', 'createdAt:-1', 'ts:-1', 'username', 'name']
           }
         },

package/lib/collect-models.js

@@ -10,7 +10,7 @@ import actionFactory from './factory/action.js'
  * @param {Array} [indexes] - Container array to fill up found index
  */
 async function sanitizeProp (model, prop, indexes) {
-  const { isEmpty, isString, keys, pick } = this.app.lib._
+  const { isEmpty, isString, keys, pick, isArray, isPlainObject, camelCase } = this.app.lib._
   const allPropKeys = this.getAllPropertyKeys(model.connection.driver)
   const propType = this.constructor.propertyType
   if (isString(prop)) {
@@ -22,6 +22,12 @@ async function sanitizeProp (model, prop, indexes) {
     prop.required = required === 'true'
   }
   prop.type = prop.type ?? 'string'
+  if (isArray(prop.values)) {
+    prop.values = prop.values.map(item => {
+      if (isPlainObject(item)) return pick(item, ['value', 'text'])
+      return { value: item, text: camelCase(item) }
+    })
+  } else if (!isString(prop.values)) delete prop.values
   if (prop.index) {
     if (prop.index === true || prop.index === 'true') prop.index = 'index'
     const [idx, idxName] = prop.index.split(':')

package/lib/factory/driver.js

@@ -216,6 +216,11 @@ async function driverFactory () {
       }
     }
 
+    _injectMeta (result = {}, options = {}) {
+      result.warnings = result.warnings ?? []
+      result.warnings.push(...(options.warnings ?? []))
+    }
+
     async _createRecord (model, body = {}, options = {}) {
       const { isSet } = this.app.lib.aneka
       await this._prepBodyForCreate(model, body, options)
@@ -231,6 +236,7 @@ async function driverFactory () {
       const result = await this.createRecord(model, input, options)
       if (options.noResult) return
       result.data = this.sanitizeRecord(model, result.data)
+      this._injectMeta(result, options)
       return result
     }
 
@@ -254,6 +260,7 @@ async function driverFactory () {
       const result = await this.getRecord(model, id, options)
       if (isEmpty(result.data) && options.throwNotFound) throw this.plugin.error('recordNotFound%s%s', id, model.name)
       result.data = this.sanitizeRecord(model, result.data)
+      this._injectMeta(result, options)
       return result
     }
 
@@ -272,6 +279,7 @@ async function driverFactory () {
       if (options.noResult) return
       result.oldData = this.sanitizeRecord(model, result.oldData)
       result.data = this.sanitizeRecord(model, result.data)
+      this._injectMeta(result, options)
       return result
     }
 
@@ -291,6 +299,7 @@ async function driverFactory () {
       if (options.noResult) return
       if (result.oldData) result.oldData = this.sanitizeRecord(model, result.oldData)
       result.data = this.sanitizeRecord(model, result.data)
+      this._injectMeta(result, options)
       return result
     }
 
@@ -303,11 +312,13 @@ async function driverFactory () {
       const result = await this.removeRecord(model, id, options)
       if (options.noResult) return
       result.oldData = this.sanitizeRecord(model, result.oldData)
+      this._injectMeta(result, options)
       return result
     }
 
     async _clearRecord (model, options = {}) {
       const result = await this.clearRecord(model, options)
+      this._injectMeta(result, options)
       return result
     }
 
@@ -316,6 +327,7 @@ async function driverFactory () {
       for (const idx in result.data) {
         result.data[idx] = this.sanitizeRecord(model, result.data[idx])
       }
+      this._injectMeta(result, options)
       return result
     }
 
@@ -324,6 +336,7 @@ async function driverFactory () {
       for (const idx in result.data) {
         result.data[idx] = this.sanitizeRecord(model, result.data[idx])
       }
+      this._injectMeta(result, options)
       return result
     }
 
@@ -349,6 +362,7 @@ async function driverFactory () {
       for (const idx in result.data) {
         result.data[idx] = this.sanitizeRecord(model, result.data[idx])
       }
+      this._injectMeta(result, options)
       return result
     }
 
@@ -369,6 +383,7 @@ async function driverFactory () {
       for (const idx in result.data) {
         result.data[idx] = this.sanitizeRecord(model, result.data[idx])
       }
+      this._injectMeta(result, options)
       return result
     }
 

package/lib/factory/model/_util.js

@@ -53,14 +53,14 @@ export async function execValidation (body, options = {}) {
 export async function getFilterAndOptions (filter = {}, options = {}, action) {
   const { cloneDeep, omit } = this.app.lib._
   const { runModelHook } = this.app.dobo
-  const keys = ['req', 'reply']
-  const nFilter = cloneDeep(omit(filter, keys))
-  const nOptions = cloneDeep(omit(options, keys))
+  const omittedKeys = ['req', 'reply']
+  const nFilter = cloneDeep(omit(filter, omittedKeys))
+  const nOptions = cloneDeep(omit(options, omittedKeys))
   nOptions.action = action
   nOptions.dataOnly = false
   nOptions.truncateString = nOptions.truncateString ?? false
   nOptions.throwNotFound = nOptions.throwNotFound ?? true
-  for (const key of keys) {
+  for (const key of omittedKeys) {
     nOptions[key] = options[key]
   }
   nFilter.orgQuery = nFilter.query
@@ -234,10 +234,7 @@ export function buildFilterQuery (filter = {}) {
       query = trim(query)
       if (query.startsWith('{')) q = JSON.parse(query) // JSON formatted query
       else if (query.includes(':')) q = nql(query).parse() // NQL
-      else if (this.driver.support.search) {
-        filter.search = q
-        return {} //
-      } else {
+      else {
         let scanables = [...this.scanables]
         if (scanables.length === 0) scanables = [...this.sortables]
         const fields = scanables.filter(f => {
@@ -380,10 +377,15 @@ export function preparePagination (filter = {}, options = {}) {
   const buildPageSkipLimit = (filter) => {
     let limit = parseInt(filter.limit) || config.default.filter.limit
     if (limit === -1) limit = config.default.filter.maxLimit
-    if (limit > config.default.filter.maxLimit) limit = config.default.filter.maxLimit
+    if (limit > config.default.filter.maxLimit) {
+      options.warnings = options.warnings ?? []
+      options.warnings.push(options.req ? options.req.t('maxLimitWarning%s%s', limit, config.default.filter.maxLimit) : this.plugin.t('maxLimitWarning%s', limit, config.default.filter.maxLimit))
+      limit = config.default.filter.maxLimit // TODO: notify as warning in response object
+    }
     if (limit < 1) limit = 1
     let page = parseInt(filter.page) || 1
     if (page < 1) page = 1
+    if (page > config.default.filter.maxPage) throw this.plugin.error('maxPageError%s%s', page, config.default.filter.maxPage)
     let skip = (page - 1) * limit
     if (filter.skip) {
       skip = parseInt(filter.skip) || skip

package/lib/factory/model/find-all-record.js

@@ -43,12 +43,14 @@ async function loop (params, opts, dataOnly) {
   nFilter.limit = maxLimit
   nFilter.page = 1
   let count = 0
+  const warnings = options.warnings ?? []
   const data = []
   for (;;) {
     const result = await this.findRecord(nFilter, nOptions)
     if (result.data.length === 0) break
     if (count + result.data.length > hardLimit) {
       const sliced = result.data.slice(0, hardLimit - count)
+      warnings.push(options.req ? options.req.t('hardLimitWarning%s%s', result.data.length, hardLimit) : this.plugin.t('hardLimitWarning%s%s', result.data.length, hardLimit))
       data.push(...sliced)
       break
     }
@@ -56,7 +58,7 @@ async function loop (params, opts, dataOnly) {
     count = count + result.data.length
     nFilter.page++
   }
-  return dataOnly ? data : { data, count }
+  return dataOnly ? data : { data, count, warnings }
 }
 
 async function findAllRecord (...args) {

package/lib/factory/model/validate.js

@@ -89,8 +89,9 @@ const validator = {
   timestamp: ['timestamp']
 }
 
-function buildFromDbModel (opts = {}) {
+async function buildFromDbModel (opts = {}) {
   const { isPlainObject, get, isEmpty, isString, keys, find, has, without } = this.app.lib._
+  const { callHandler } = this.app.bajo
   const { fields = [], rule = {}, extFields = [] } = opts
   const obj = {}
   const { propertyType: propType } = this.app.baseClass.Dobo
@@ -110,7 +111,7 @@ function buildFromDbModel (opts = {}) {
     return { key, value, columns }
   }
 
-  function applyFieldRules (prop, obj) {
+  async function applyFieldRules (prop, obj) {
     const minMax = { min: false, max: false }
     const rules = get(rule, prop.name, prop.rules ?? [])
     if (!Array.isArray(rules)) return rules
@@ -133,8 +134,23 @@ function buildFromDbModel (opts = {}) {
         if (has(prop, `${k}Length`)) obj = obj[k](prop[`${k}Length`])
       }
     }
-    if (Array.isArray(prop.values)) obj = obj.valid(...prop.values)
     if (!['id'].includes(prop.name) && prop.required) obj = obj.required()
+    if (prop.values) {
+      let items = []
+      if (Array.isArray(prop.values)) items = prop.values.map(item => item.value)
+      else if (typeof prop.values === 'string') {
+        const resp = await callHandler(prop.values)
+        items = resp.map(item => item.value)
+      }
+      obj = obj.valid(...items)
+    }
+    if (prop.rulesMsg) {
+      const msgs = {}
+      for (const k in prop.rulesMsg) {
+        msgs[k] = '~' + prop.rulesMsg[k] // note: to tell bajo error formatter that this is a custom error message
+      }
+      obj = obj.messages(msgs)
+    }
     return obj
   }
 
@@ -147,28 +163,28 @@ function buildFromDbModel (opts = {}) {
     switch (p.type) {
       case 'text':
       case 'string': {
-        item = applyFieldRules(p, joi.string())
+        item = await applyFieldRules(p, joi.string())
         break
       }
       case 'smallint':
       case 'integer':
-        item = applyFieldRules(p, joi.number().integer())
+        item = await applyFieldRules(p, joi.number().integer())
         break
       case 'float':
       case 'double':
-        if (p.precision) item = applyFieldRules(p, joi.number().precision(p.precision))
-        else item = applyFieldRules(p, joi.number())
+        if (p.precision) item = await applyFieldRules(p, joi.number().precision(p.precision))
+        else item = await applyFieldRules(p, joi.number())
         break
       case 'time':
       case 'date':
       case 'datetime':
-        item = applyFieldRules(p, joi.date())
+        item = await applyFieldRules(p, joi.date())
         break
       case 'timestamp':
-        item = applyFieldRules(p, joi.number().integer())
+        item = await applyFieldRules(p, joi.number().integer())
         break
       case 'boolean':
-        item = applyFieldRules(p, joi.boolean())
+        item = await applyFieldRules(p, joi.boolean())
         break
     }
     if (item) {
@@ -218,7 +234,7 @@ async function validate (body, joiModel, opts = {}) {
   params = defaultsDeep(params, this.app.dobo.config.validationParams)
   const { rule = {} } = params
   delete params.rule
-  if (isEmpty(joiModel)) joiModel = buildFromDbModel.call(this, { fields, rule, extFields, partial })
+  if (isEmpty(joiModel)) joiModel = await buildFromDbModel.call(this, { fields, rule, extFields, partial })
   if (!joiModel) return { value: body }
   try {
     return await joiModel.validateAsync(body, params)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dobo",
-  "version": "2.6.6",
+  "version": "2.8.0",
   "description": "DBMS for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## 2026-02-22
+
+- [2.8.0] Add ```warnings``` to response object
+- [2.8.0] Throw error if ```page``` above the allowed threshold
+
+## 2026-02-20
+
+- [2.7.0] Add ```prop.values``` support
+- [2.7.0] Add ```prop.rulesMsg``` support
+- [2.7.0] Change ```buildFromDbModel()``` on validation to async function
+
 ## 2026-02-17
 
 - [2.6.5] Bug fix on model extender