dobo 2.21.0 → 2.21.1

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

@@ -150,7 +150,7 @@
   "maxPageError%s%s": "Page number (%s) above the allowed threshold (%s)",
   "duplicateRefKeys%s%s": "Duplicate reference keys found in '%s' (%s)",
   "sanitizeBodyError": "Error sanitizing body",
-  "virtualFieldIn%s%s": "Virtual field can't be used in '%s' on %s",
+  "virtualFieldIn%s%s%s": "Virtual field '%s' can't be used in '%s' on %s",
   "field": {
     "id": "ID",
     "code": "Kode",

package/extend/bajo/intl/id.json

@@ -148,7 +148,7 @@
   "maxPageError%s%s": "Nomor halaman (%s) melampaui batas yang diijinkan (%s)",
   "duplicateRefKeys%s%s": "Ditemukan kunci referensi duplikat di '%s' (%s)",
   "sanitizeBodyError": "Kesalahan saat sanitasi body",
-  "virtualFieldIn%s%s": "Kolom virtual tidak bisa digunakan di '%s' pada %s",
+  "virtualFieldIn%s%s%s": "Kolom virtual '%s' tidak bisa digunakan di '%s' pada %s",
   "field": {
     "id": "ID",
     "code": "Kode",

package/lib/collect-models.js

@@ -29,6 +29,7 @@ async function sanitizeProp (model, prop, indexes) {
     })
   } else if (!isString(prop.values)) delete prop.values
   if (prop.hidden) model.hidden.push(prop.name)
+  if (prop.scanable) model.scanables.push(prop.scanable)
   if (prop.virtual) {
     const keys = Object.keys(propType)
     if (!keys.includes(prop.type)) this.fatal('unknownPropType%s%s', `${prop.name}:${prop.type}`, model.name)
@@ -160,7 +161,7 @@ export async function sanitizeRef (model, models) {
       }
       ref.field = ref.field ?? 'id'
       ref.type = ref.type ?? '1:1'
-      ref.searchField = ref.searchField ?? model.scanables[0] ?? ref.field
+      ref.searchField = ref.searchField ?? ref.field
       ref.labelField = ref.labelField ?? ref.searchField
       const rModel = find(models, { name: ref.model })
       if (!rModel) {
@@ -318,7 +319,7 @@ async function collectModels () {
 
     const base = path.basename(file, path.extname(file))
     const defName = pascalCase(`${this.alias} ${base}`)
-    const item = await readConfig(file, { ns: this.ns, baseNs: me.ns })
+    const item = await readConfig(file, { ns: this.ns, baseNs: me.ns, merge: true })
     if (isEmpty(item)) return undefined
     if (!isPlainObject(item)) me.fatal('invalidModel%s', defName)
     item.name = item.name ?? defName
@@ -345,12 +346,12 @@ async function collectModels () {
     for (const item of model.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', 'index', model.name)
+        if (!prop || (prop && prop.virtual)) throw this.error('virtualFieldIn%s%s%s', field, 'index', model.name)
       }
     }
-    for (const field of model.scanable) {
+    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', 'scanable', model.name)
+      if (!prop || (prop && prop.virtual)) throw this.error('virtualFieldIn%s%s%s', field, 'scanable', model.name)
     }
   }
   this.log.debug('collected%s%d', this.t('model'), this.models.length)

package/lib/factory/driver.js

@@ -272,7 +272,7 @@ async function driverFactory () {
     }
 
     async _updateRecord (model, id, input = {}, options = {}) {
-      let body = omit(input, this.getVirtualFields())
+      let body = omit(input, this.getVirtualFields(model))
       if (!options.noUniqueCheck) {
         if (!this.support.uniqueIndex) await this._checkUnique(model, body, options)
       }
@@ -292,7 +292,7 @@ async function driverFactory () {
     }
 
     async _upsertRecord (model, input = {}, options = {}) {
-      let body = omit(input, this.getVirtualFields())
+      let body = omit(input, this.getVirtualFields(model))
       if (!options.noUniqueCheck) {
         if (!this.uniqueIndexSupport) await this._checkUnique(model, body, options)
       }

package/lib/factory/model/_util.js

@@ -232,7 +232,7 @@ export async function getMultiRefs (records = [], options = {}) {
           if (!rModel) return
           let matches = []
           for (const r of records) {
-            matches.push(rModel.sanitizeId(r[prop.name]))
+            matches.push(prop.name === 'id' ? rModel.sanitizeId(r[prop.name]) : r[prop.name])
           }
           matches = uniq(without(matches, undefined, null, NaN)).map(i => i + '')
           let query = {}
@@ -438,7 +438,7 @@ export function preparePagination (filter = {}, options = {}) {
 }
 
 export async function clearCache (id) {
-  const { clear } = this.app.bajoCache
+  const { clear } = this.app.bajoCache ?? {}
   if (!clear) return
   await clear({ key: `dobo|${this.name}|getRecord|${id}` })
   await clear({ key: `dobo|${this.name}|findRecord` })

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

@@ -24,8 +24,8 @@ async function createRecord (...args) {
   result = result ?? {}
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
-  if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
+  if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   await handleReq.call(this, result.data.id, 'created', options)
   await execDynHook.call(this, 'afterCreateRecord', input, result, options)
   await execModelHook.call(this, 'afterCreateRecord', input, result, options)

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

@@ -37,12 +37,12 @@ async function native (...args) {
   result.pages = options.count ? Math.ceil(result.count / filter.limit) : undefined
   if (!warnings) delete result.warnings
 
+  if (isSet(options.refs)) await getMultiRefs.call(this, result.data, options)
   if (!noResultSanitizer) {
     for (const idx in result.data) {
       result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
     }
   }
-  if (isSet(options.refs)) await getMultiRefs.call(this, result.data, options)
   await execDynHook.call(this, 'afterFindRecord', filter, result, options)
   await execModelHook.call(this, 'afterFindRecord', filter, result, options)
   await execHook.call(this, 'afterFindRecord', filter, result, options)

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

@@ -101,13 +101,12 @@ async function findRecord (...args) {
   }
   result.pages = options.count ? Math.ceil(result.count / filter.limit) : undefined
   if (!warnings) delete result.warnings
-
+  if (isSet(options.refs)) await getMultiRefs.call(this, result.data, options)
   if (!noResultSanitizer) {
     for (const idx in result.data) {
       result.data[idx] = await this.sanitizeRecord(result.data[idx], options)
     }
   }
-  if (isSet(options.refs)) await getMultiRefs.call(this, result.data, options)
   await execDynHook.call(this, 'afterFindRecord', filter, result, options)
   await execModelHook.call(this, 'afterFindRecord', filter, result, options)
   await execHook.call(this, 'afterFindRecord', filter, result, options)

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

@@ -68,8 +68,8 @@ async function getRecord (...args) {
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (isEmpty(result.data) && !options.throwNotFound) return dataOnly ? undefined : { data: undefined }
-  if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
+  if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   await execDynHook.call(this, 'afterGetRecord', id, result, options)
   await execModelHook.call(this, 'afterGetRecord', id, result, options)
   await execHook.call(this, 'afterGetRecord', id, result, options)

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

@@ -25,13 +25,14 @@ async function sanitizeRecord (record = {}, opts = {}) {
   newFields = without(newFields, ...allHidden)
   const body = fillObject(record, newFields, null)
   const newRecord = await this.sanitizeBody({ body, noDefault: true })
+  if (record._ref) newRecord._ref = cloneDeep(record._ref)
   for (const key in newRecord) {
     const prop = this.getProperty(key)
+    if (!prop) continue
     const val = ['object', 'array'].includes(prop.type) ? cloneDeep(newRecord[key]) : newRecord[key]
     if (isFunction(prop.getValue)) newRecord[key] = await prop.getValue.call(this, val, newRecord, opts)
     else if (isString(prop.getValue)) newRecord[key] = await callHandler(this.plugin, this, val, newRecord, opts)
   }
-
   if (opts.fmt) {
     newRecord._fmt = cloneDeep(newRecord)
     for (const key in newRecord) {
@@ -55,7 +56,6 @@ async function sanitizeRecord (record = {}, opts = {}) {
       }
     }
   }
-  if (record._ref) newRecord._ref = record._ref
   return newRecord
 }
 

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

@@ -71,11 +71,11 @@ async function updateRecord (...args) {
   if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
+  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
   if (!noResultSanitizer) {
     result.data = await this.sanitizeRecord(result.data, options)
     result.oldData = await this.sanitizeRecord(result.oldData, options)
   }
-  if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
   await handleReq.call(this, result.data.id, 'updated', options)
   await execDynHook.call(this, 'afterUpdateRecord', id, input, result, options)
   await execModelHook.call(this, 'afterUpdateRecord', id, input, result, options)

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

@@ -20,8 +20,8 @@ async function native (body = {}, opts = {}) {
   if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
-  if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
+  if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   await handleReq.call(this, result.data.id, 'upserted', options)
   await execDynHook.call(this, 'afterUpsertRecord', input, result, options)
   await execModelHook.call(this, 'afterUpsertRecord', input, result, options)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 2026-04-28
+
+- [2.21.1] Bug fix in ```collect-models.js```
+- [2.21.1] Bug fix in ```driver._updateRecord()```
+- [2.21.1] Bug fix in ```util.getMultiRef()```
+- [2.21.1] Bug fix in setting references
+- [2.21.1] Bug fix in ```model.sanitizeRecord()```
+
 ## 2026-04-25
 
 - [2.21.0] Change ```options.formatValue``` to ```options.fmt```