dobo 2.18.0 → 2.18.2

package/index.js

@@ -501,9 +501,12 @@ async function factory (pkgName) {
     }
 
     getDefaultValues = (options = {}) => {
+      const { defaultsDeep } = this.app.lib.aneka
       const key = 'default.filter'
-      let config = this.app.dobo.getConfig(key)
-      if (options.req) config = options.req.getSetting(`dobo:${key}`, config)
+      let config = this.getConfig(key)
+      config.hardCap = this.config.default.hardCap
+      config.warnings = this.config.default.warnings
+      if (options.req) config = defaultsDeep({}, options.req.getSetting('dobo:default'), config)
       const { limit, maxLimit, maxPage, hardCap, warnings } = config
       const t = options.req ? options.req.t : this.t
       return { limit, maxLimit, hardCap, maxPage, warnings, t }

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 } = this.app.lib._
+  const { isEmpty, isString, keys, pick, isArray, isPlainObject, omit } = this.app.lib._
   const allPropKeys = this.getAllPropertyKeys(model.connection.driver)
   const propType = this.constructor.propertyType
   if (isString(prop)) {
@@ -39,7 +39,9 @@ async function sanitizeProp (model, prop, indexes) {
   else {
     const feature = this.getFeature(prop.type)
     if (!feature) this.fatal('unknownPropType%s%s', prop.type, model.name)
-    await applyFeature.call(this, model, feature, { field: prop.name }, indexes)
+    const opts = omit(prop, ['name', 'type'])
+    opts.field = prop.name
+    await applyFeature.call(this, model, feature, opts, indexes)
   }
 }
 

package/lib/factory/model/create-attachment.js

@@ -6,10 +6,12 @@ async function createAttachment (...args) {
   if (args.length === 0) return this.action(action, ...args)
   const [id, opts = {}] = args
   const { fs } = this.app.lib
-  const { isEmpty } = this.app.lib._
+  const { isEmpty, last } = this.app.lib._
   const { source, field = 'file', file, fullPath, stats, mimeType, req } = opts
   if (isEmpty(file)) return
   if (!source) throw this.plugin.error('isMissing%s', this.plugin.t('field.source'))
+  const [, filename] = last(source.split('/')).split('@')
+  if (isEmpty(filename)) return
   const baseDir = await getAttachmentPath.call(this, id, field, file, { dirOnly: true })
   let dir = `${baseDir}/${field}`
   if ((field || '').endsWith('[]')) dir = `${baseDir}/${field.replace('[]', '')}`

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

@@ -20,7 +20,7 @@ async function sanitizeBody ({ body = {}, partial, strict, extFields = [], noDef
   const result = {}
 
   const sanitize = (name, type) => {
-    if (onlyTypes.length > 0 && !onlyTypes.includes(type)) return
+    // if (onlyTypes.length > 0 && !onlyTypes.includes(type)) return
     if (['object', 'array'].includes(type)) result[name] = sanitizeObject(result[name], { strict, action, model: this.name })
     else if (type === 'boolean') result[name] = sanitizeBoolean(result[name])
     else if (['float', 'double'].includes(type)) result[name] = sanitizeFloat(result[name], { strict })

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

@@ -28,16 +28,28 @@ async function sanitizeRecord (record = {}, opts = {}) {
     for (const key in newRecord) {
       const prop = this.getProperty(key)
       if (!prop) continue
-      const value = ['object', 'array'].includes(prop.type) ? cloneDeep(newRecord[key]) : newRecord[key]
       if (prop.formatValue && opts.retainOriginalValue) {
-        const value = ['object', 'array'].includes(prop.type) ? cloneDeep(newRecord._orig[key]) : newRecord._orig[key]
-        if (isFunction(prop.formatValue)) newRecord._orig[key] = await prop.formatValue.call(this, value, newRecord._orig, opts)
-        else if (isString(prop.formatValue)) newRecord._orig[key] = await callHandler(this.plugin, this, value, newRecord._orig, opts)
+        const val = ['object', 'array'].includes(prop.type) ? cloneDeep(newRecord._orig[key]) : newRecord._orig[key]
+        if (isFunction(prop.formatValue)) newRecord._orig[key] = await prop.formatValue.call(this, val, newRecord._orig, opts)
+        else if (isString(prop.formatValue)) newRecord._orig[key] = await callHandler(this.plugin, this, val, newRecord._orig, opts)
       }
-      if (prop.format) {
-        if (isFunction(prop.format)) newRecord[key] = await prop.format.call(this, value, newRecord, opts)
-        else if (isString(prop.format)) newRecord[key] = await callHandler(this.plugin, this, value, newRecord, opts)
-      } else {
+      let value = ['object', 'array'].includes(prop.type) ? cloneDeep(newRecord[key]) : newRecord[key]
+      if (prop.values) {
+        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 { camelCase } = this.app.lib._
+            const key = camelCase(`${prop.name} ${v.text}`)
+            if (opts.req.te(key)) v.text = opts.req.t(key)
+          }
+          return v
+        })
+        value = (values.find(v => v.value === value) ?? {}).text ?? value
+      }
+      if (prop.format === false) newRecord[key] = value + ''
+      else if (isFunction(prop.format)) newRecord[key] = await prop.format.call(this, value, newRecord, opts)
+      else if (isString(prop.format)) newRecord[key] = await callHandler(this.plugin, this, value, newRecord, opts)
+      else {
         const options = {
           lang: get(opts, 'req.lang'),
           latitude: ['lat', 'latitude'].includes(key),

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,18 @@
 # Changes
 
+## 2026-04-18
+
+- [2.18.2] Bug fix in ```config``` object
+- [2.18.2] Bug fix in ```getDefaultValues```
+- [2.18.2] Bug fix in ```sanitizeProp()``` in ```collect-models.js```
+- [2.18.2] Bug fix in ```sanitizeRecord()``` for prop with ```format``` set to ```false```
+
+## 2026-04-17
+
+- [2.18.1] Bug fix in ```model.createAttachment()```
+- [2.18.1] Bug fix in ```model.sanitizeBody()```
+- [2.18.1] Bug fix in ```model.sanitizeRecord()```
+
 ## 2026-04-16
 
 - [2.18.0] Add parameter options to ```sanitizeObject()```