dobo 2.30.3 → 2.30.5

package/lib/factory/driver.js

@@ -191,9 +191,10 @@ async function driverFactory () {
     }
 
     async _prepBodyForCreate (model, body = {}, options = {}) {
+      const { callHandler } = this.app.bajo
       const { isSet, generateId } = this.app.lib.aneka
       for (const prop of model.getProperties({ noVirtual: true })) {
-        if (!isSet(body[prop.name]) && isSet(prop.default)) {
+        if (isSet(prop.default) && (!options.noDefault) && (!isSet(body[prop.name]) || body[prop.name] === prop.default)) {
           if (isFunction(prop.default)) body[prop.name] = await prop.default.call(model)
           else if (typeof prop.default !== 'string') body[prop.name] = prop.default
           else {
@@ -207,6 +208,9 @@ async function driverFactory () {
               body[prop.name] = ulid().slice(0, prop.maxLength)
             } else if (prop.default === 'generateid' && prop.type === 'string') {
               body[prop.name] = generateId()
+            } else if (prop.default.startsWith('handler:')) {
+              const [, ...args] = prop.default.split(':')
+              if (args.length > 0) body[prop.name] = await callHandler(args.join(':'))
             } else if (prop.default.startsWith('md5:') && prop.type === 'string') {
               const [, field] = prop.default.split(':')
               const fields = field.split(',')

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

@@ -14,9 +14,8 @@
  */
 async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDefault, truncateString, onlyTypes = [], action } = {}) {
   const { isSet } = this.app.lib.aneka
-  const { callHandler } = this.app.bajo
   const { sanitizeByType } = this.app.dobo
-  const { omit, has, isString } = this.app.lib._
+  const { omit, has } = this.app.lib._
   const result = {}
 
   const sanitize = (name, type) => {
@@ -27,7 +26,7 @@ async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDef
 
   const omitted = []
   const details = []
-  const properties = [...this.getProperties(), ...extFields]
+  const properties = [...this.getNonVirtualProperties(), ...extFields]
   for (const prop of properties) {
     try {
       if (partial && !has(body, prop.name)) {
@@ -37,15 +36,6 @@ async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDef
       result[prop.name] = body[prop.name]
       if (prop.type === 'array' && isSet(result[prop.name]) && !Array.isArray(result[prop.name])) result[prop.name] = [result[prop.name]]
       if (isSet(result[prop.name])) sanitize(prop.name, prop.type)
-      else {
-        if (isSet(prop.default) && !noDefault) {
-          result[prop.name] = prop.default
-          if (isString(prop.default) && prop.default.startsWith('handler:')) {
-            const [, ...args] = prop.default.split(':')
-            if (args.length > 0) result[prop.name] = await callHandler(args.join(':'))
-          } else sanitize(prop.name, prop.type)
-        }
-      }
       if (result[prop.name] === null) continue
       if (truncateString && isSet(result[prop.name]) && ['string', 'text'].includes(prop.type)) result[prop.name] = result[prop.name].slice(0, prop.maxLength)
       if (prop.name.endsWith('Id') && isSet(result[prop.name]) && prop.type === 'string' && ['smallint', 'integer'].includes(this.driver.idField.type)) result[prop.name] = result[prop.name] + ''

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

@@ -40,7 +40,8 @@ async function sanitizeRecord (record = {}, opts = {}) {
       let value = ['object', 'array'].includes(prop.type) ? cloneDeep(newRecord[key]) : newRecord[key]
       if (prop.values) {
         const values = await this.buildPropValues(prop, opts)
-        value = (values.find(v => v.value === value) ?? {}).text ?? value
+        if (isArray(value)) value = value.map(v => (values.find(opt => opt.value === v) ?? {}).text ?? v)
+        else value = (values.find(v => v.value === value) ?? {}).text ?? value
       }
       if (prop.format === false) newRecord._fmt[key] = value + ''
       else if (isFunction(prop.format)) newRecord._fmt[key] = await prop.format.call(this, value, newRecord, opts)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-06-24
+
+- [2.30.5] Bug fix in ```model.sanitizeBody()```
+- [2.30.5] Bug fix in ```model.sanitizeRecord()```
+
+## 2026-06-16
+
+- [2.30.4] Bug fix in ```model.sanitizeBody()```
+- [2.30.4] Bug fix in ```model._prepBodyForCreate()```
+
 ## 2026-06-13
 
 - [2.30.2] Bug fix in ```model.findAllRecord()```