dobo 2.27.2 → 2.28.0

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, isArray, isPlainObject, omit } = this.app.lib._
+  const { isEmpty, isString, keys, pick, isArray, isPlainObject, omit, isFunction } = this.app.lib._
   const allPropKeys = this.getAllPropertyKeys(model.connection.driver)
   const propType = this.constructor.propertyType
   if (isString(prop)) {
@@ -27,7 +27,7 @@ async function sanitizeProp (model, prop, indexes) {
       if (isPlainObject(item)) return pick(item, ['value', 'text'])
       return { value: item, text: item }
     })
-  } else if (!isString(prop.values)) delete prop.values
+  } else if (!(isString(prop.values) || isFunction(prop.values))) delete prop.values
   if (prop.hidden) model.hidden.push(prop.name)
   if (prop.scanable) model.scanables.push(prop.scanable)
   if (prop.virtual) {
@@ -149,7 +149,6 @@ async function findAllIndexes (model, inputs = [], indexes = []) {
  */
 export async function sanitizeRef (model, models) {
   const { find, isString, pullAt } = this.app.lib._
-  if (!models) models = this.models
   const _refKeys = []
   for (const prop of model.properties) {
     const ignored = []
@@ -339,30 +338,24 @@ async function collectModels () {
   }, { glob: ['model/*.*', 'model.*'], prefix: this.ns })
   schemas = orderBy(schemas, ['buildLevel', 'name'])
   for (const schema of schemas) {
-    const plugin = this.app[schema.ns]
-    delete schema.ns
     const idProp = schema.properties.find(p => p.name === 'id')
     if (!this.constructor.idTypes.includes(idProp.type)) this.fatal('invalidIdType%s%s', schema.name, this.constructor.idTypes.join(', '))
     if (idProp.type === 'string' && !has(idProp, 'maxLength')) idProp.maxLength = 50
-    const model = new this.app.baseClass.DoboModel(plugin, omit(schema, ['beforeCreate', 'afterCreate']))
-    schema.model = model
-    me.models.push(model)
-  }
-  // last sanitizing & checking
-  for (const schema of schemas) {
-    const model = schema.model
-    await sanitizeRef.call(this, model, me.models)
-    for (const item of model.indexes) {
+    const plugin = this.app[schema.ns]
+    await sanitizeRef.call(this, schema, schemas)
+    for (const item of schema.indexes) {
       for (const field of item.fields) {
-        const prop = model.properties.find(p => p.name === field)
-        if (!prop || (prop && prop.virtual)) throw this.error('virtualFieldIn%s%s%s', field, 'index', model.name)
+        const prop = schema.properties.find(p => p.name === field)
+        if (!prop || (prop && prop.virtual)) throw this.error('virtualFieldIn%s%s%s', field, 'index', schema.name)
       }
     }
-    for (const field of model.scanables) {
-      const prop = model.properties.find(p => p.name === field)
-      if (!prop || (prop && prop.virtual)) throw this.error('virtualFieldIn%s%s%s', field, 'scanable', model.name)
+    for (const field of schema.scanables) {
+      const prop = schema.properties.find(p => p.name === field)
+      if (!prop || (prop && prop.virtual)) throw this.error('virtualFieldIn%s%s%s', field, 'scanable', schema.name)
     }
-    if (schema.buildEnd) await callHandler(model.plugin, schema.buildEnd, model)
+    if (schema.buildEnd) await callHandler(plugin, schema.buildEnd, schema)
+    const model = new this.app.baseClass.DoboModel(plugin, omit(schema, ['beforeCreate', 'afterCreate']))
+    me.models.push(model)
   }
   schemas = []
   this.log.debug('collected%s%d', this.t('model'), this.models.length)

package/lib/factory/model/_util.js

@@ -417,17 +417,3 @@ export async function clearCache (id) {
   await clear({ key: `dobo|${this.name}|findAllRecord` })
   await clear({ key: `dobo|${this.name}|findOneRecord` })
 }
-
-export async function buildPropValues (prop, opts) {
-  const { isString, camelCase } = this.app.lib._
-  const { callHandler } = this.app.bajo
-  const values = (isString(prop.values) ? await callHandler(prop.values) : [...prop.values]).map(v => {
-    if (isString(v)) v = { value: v, text: v }
-    if (opts.req) {
-      const key = camelCase(`${prop.name} ${v.text}`)
-      if (opts.req.te(key)) v.text = opts.req.t(key)
-    }
-    return v
-  })
-  return values
-}

package/lib/factory/model/sanitize-record.js

@@ -1,5 +1,3 @@
-import { buildPropValues } from './_util.js'
-
 /**
  * Sanitize record to conform with the model's definition
  *
@@ -41,7 +39,7 @@ async function sanitizeRecord (record = {}, opts = {}) {
       if (!prop) continue
       let value = ['object', 'array'].includes(prop.type) ? cloneDeep(newRecord[key]) : newRecord[key]
       if (prop.values) {
-        const values = await buildPropValues.call(this, prop, opts)
+        const values = await this.buildPropValues(prop, opts)
         value = (values.find(v => v.value === value) ?? {}).text ?? value
       }
       if (prop.format === false) newRecord._fmt[key] = value + ''

package/lib/factory/model/validate.js

@@ -91,11 +91,11 @@ const validator = {
 
 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
   const refs = []
+  const me = this
 
   function getRuleKv (kvRule) {
     let key
@@ -136,12 +136,8 @@ async function buildFromDbModel (opts = {}) {
     }
     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)
-      }
+      const values = await me.buildPropValues(prop, opts)
+      const items = values.map(item => item.value)
       if (prop.type === 'array') {
         obj = obj.items(joi.string().valid(...items))
       } else obj = obj.valid(...items)

package/lib/factory/model.js

@@ -147,6 +147,20 @@ async function modelFactory () {
       return get(rec, field, null)
     }
 
+    buildPropValues = async (prop, opts) => {
+      const { isString, camelCase, isFunction } = this.app.lib._
+      const { callHandler } = this.app.bajo
+      const values = isString(prop.values) || isFunction(prop.values) ? await callHandler(this, prop.values, opts) : [...prop.values]
+      return values.map(v => {
+        if (isString(v)) v = { value: v, text: v }
+        if (opts.req) {
+          const key = camelCase(`${prop.name} ${v.text}`)
+          if (opts.req.te(key)) v.text = opts.req.t(key)
+        }
+        return v
+      })
+    }
+
     build = build
     exists = exists
     drop = drop

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## 2026-06-03
+
+- [2.28.0] Property ```values``` can now accept a function that will be called dynamically upon used
+- [2.28.0] ```_util.buildPropValues()``` now become a new model method
+- [2.28.0] Bug fix in ```model.sanitizeRecord()```
+- [2.28.0] Bug fix in ```model.validate()```
+
 ## 2026-05-30
 
 - [2.27.0] Bug fix in ```model.transaction()```