dobo 2.6.5 → 2.7.0

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

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(':')
@@ -110,15 +116,15 @@ async function findAllFeats (model, inputs = [], indexes = [], isExtender) {
  * @param {Object} model - Model
  * @param {Array} [inputs] - Array of properties
  */
-async function findAllIndexes (model, inputs = []) {
-  const indexes = []
+async function findAllIndexes (model, inputs = [], indexes = []) {
+  const items = []
   for (const index of inputs) {
     index.type = index.type ?? 'index'
     index.fields = index.fields ?? []
     if (!index.name) index.name = `${model.name}_${index.fields.join('_')}_${index.type}`
-    indexes.push(index)
+    items.push(index)
   }
-  model.indexes = indexes
+  model.indexes = [...items, ...indexes]
 }
 
 /**
@@ -262,7 +268,7 @@ async function createSchema (item) {
         if (!isPlainObject(extender)) this.plugin.fatal('invalidModelExtender%s%s', ns, item.name)
         await findAllProps.call(this, item, extender.properties ?? [], indexes, true)
         await findAllFeats.call(this, item, extender.features ?? [], indexes, true)
-        await findAllIndexes.call(this, item, extender.indexes ?? [], true)
+        await findAllIndexes.call(this, item, extender.indexes ?? [], indexes, true)
       }
     }
   }
@@ -305,9 +311,9 @@ async function collectModels () {
     item.name = item.name ?? defName
     item.collName = item.collName ?? item.name
     item.file = file
+    item.ns = this.ns
     const schema = await createSchema.call(me, item)
-    schema.ns = this.ns
-    schemas.push(item)
+    schemas.push(schema)
   }, { glob: 'model/*.*', prefix: this.ns })
   schemas = orderBy(schemas, ['buildLevel', 'name'])
   for (const schema of schemas) {

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.5",
+  "version": "2.7.0",
   "description": "DBMS for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,9 +1,16 @@
 # Changes
 
+## 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
 - [2.6.5] Bug fix on trace logging
+- [2.6.6] Bug fix on extender indexes
 
 ## 2026-02-05