dobo 2.21.0 → 2.22.0

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",
@@ -215,7 +215,9 @@
     "type": "Type",
     "model": "Model",
     "age": "Age",
-    "provider": "Provider"
+    "provider": "Provider",
+    "image": "Image",
+    "attachment": "Attachment"
   },
   "validationError": "Validation Error",
   "validation": {

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",
@@ -213,7 +213,9 @@
     "type": "Tipe",
     "model": "Model",
     "age": "Usia",
-    "provider": "Penyedia"
+    "provider": "Penyedia",
+    "image": "Gambar",
+    "attachment": "Lampiran"
   },
   "validationError": "Kesalahan Validasi",
   "validation": {

package/extend/dobo/feature/image.js

@@ -0,0 +1,25 @@
+import path from 'path'
+
+async function image (opts = {}) {
+  opts.field = opts.field ?? 'image'
+  opts.baseName = opts.baseName ?? true
+  opts.single = opts.single ?? true
+  return {
+    properties: {
+      name: opts.field,
+      type: 'string',
+      virtual: true,
+      getValue: async function (val, rec) {
+        const atts = await this.listAttachment({ id: rec.id })
+        if (atts.length === 0) return
+        let items = atts.filter(att => att.mimeType.startsWith('image/'))
+        if (opts.withLink && this.app.waibu) items = items.map(f => `<a href="${f.url}">${opts.baseName ? path.basename(f.file) : f.file}</a>`)
+        else if (opts.baseName) items = items.map(f => path.basename(f.file))
+        if (opts.single) return items[0]
+        return items
+      }
+    }
+  }
+}
+
+export default image

package/extend/waibuMpa/route/attachment/@model/@id/@field/@file.js

@@ -1,9 +1,18 @@
 import path from 'path'
 
+async function handleNotFound (req, reply) {
+  const { isEmpty, isString } = this.app.lib._
+  const { routePath } = this.app.waibu
+  if (!req.query.notfound) throw this.error('_notFound', { noContent: true })
+  const ext = path.extname(req.params.file)
+  const replacer = isString(req.query.notfound) ? req.query.notfound : `waibuStatic.asset:/not-found${isEmpty(ext) ? '.png' : ext}`
+  return reply.redirectTo(routePath(replacer))
+}
+
 async function attachment (req, reply) {
-  const { isString, isEmpty, find, last } = this.app.lib._
+  const { isEmpty, find, last } = this.app.lib._
   const { pascalCase } = this.app.lib.aneka
-  const { routePath } = this.app.waibu
+  const { createThumbnail } = this.app.bajoExtra ?? {}
   const { fs } = this.app.lib
   const mdl = this.app.dobo.getModel(req.params.model)
   const type = req.query.type
@@ -20,11 +29,24 @@ async function attachment (req, reply) {
         file === decodeURI(req.params.file)
     })
   }
-  if (!item) {
-    if (!req.query.notfound) throw this.error('_notFound', { noContent: true })
-    const ext = path.extname(req.params.file)
-    const replacer = isString(req.query.notfound) ? req.query.notfound : `waibuStatic.asset:/not-found${isEmpty(ext) ? '.png' : ext}`
-    return reply.redirectTo(routePath(replacer))
+  if (!item) return await handleNotFound.call(this, req, reply)
+  if (req.query.thumbnail) {
+    const dir = path.dirname(item.file)
+    const ext = path.extname(item.file)
+    const base = path.basename(item.file, ext)
+    const dest = `${dir}/_tn/${base}-${req.query.thumbnail}.png`
+    if (createThumbnail && !fs.existsSync(dest)) {
+      const opts = {
+        dir: `${dir}/_tn`,
+        size: req.query.thumbnail,
+        silent: true,
+        format: '.png'
+      }
+      await createThumbnail(item.file, opts)
+    }
+    if (!fs.existsSync(dest)) await handleNotFound.call(this, req, reply)
+    item.mimeType = 'image/png'
+    item.file = dest
   }
   if (!isEmpty(item.mimeType)) reply.header('Content-Type', item.mimeType)
   const stream = fs.createReadStream(item.file)

package/index.js

@@ -158,7 +158,10 @@ async function factory (pkgName) {
             ttlDur: '10s'
           },
           hardCap: 10000, // max returned records
-          warnings: true
+          warnings: true,
+          attachment: {
+            thumbSizes: ['s', 'm', 'l']
+          }
         },
         memDb: {
           autoSaveDur: '1s'

package/lib/collect-models.js

@@ -29,10 +29,11 @@ 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)
-    for (const key of ['required', 'rules', 'index', 'validator', 'ref', 'rulesMsg', 'immutable', 'feature']) {
+    for (const key of ['required', 'rules', 'index', 'validator', 'ref', 'rulesMsg', 'immutable']) {
       delete prop[key]
     }
     model.properties.push(prop)
@@ -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-attachment.js

@@ -2,6 +2,8 @@ import { mergeAttachmentInfo, getAttachmentPath } from './_util.js'
 const action = 'createAttachment'
 
 async function createAttachment (...args) {
+  const { createThumbnail } = this.app.bajoExtra
+  const { thumbSizes: size } = this.app.dobo.config.default.attachment
   if (!this.attachment) return
   if (args.length === 0) return this.action(action, ...args)
   const [id, opts = {}] = args
@@ -18,6 +20,9 @@ async function createAttachment (...args) {
   const dest = `${dir}/${file}`.replaceAll('//', '/')
   await fs.ensureDir(dir)
   await fs.copy(source, dest)
+  try {
+    if (createThumbnail) await createThumbnail(dest, { dir: `${dir}/_tn`, size, format: ['.png'] })
+  } catch (err) {}
   const rec = {
     field: field === '' ? undefined : field,
     dir,

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

@@ -20,13 +20,13 @@ async function createRecord (...args) {
   await execDynHook.call(this, 'beforeCreateRecord', input, options)
   if (!noValidation) await execValidation.call(this, input, options)
   let result = options.record ?? (await this.driver._createRecord(this, input, options)) ?? {}
+  await handleReq.call(this, result.data.id, 'created', options)
   if (noResult) return
   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)
-  await handleReq.call(this, result.data.id, 'created', options)
+  if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   await execDynHook.call(this, 'afterCreateRecord', input, result, options)
   await execModelHook.call(this, 'afterCreateRecord', input, result, options)
   await execHook.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/remove-attachment.js

@@ -1,14 +1,23 @@
 import { getAttachmentPath } from './_util.js'
+import path from 'path'
 const action = 'removeAttachment'
 
 async function removeAttachment (...args) {
   if (!this.attachment) return
   if (args.length === 0) return this.action(action, ...args)
   const [id, field, file, opts = {}] = args
-  const { fs } = this.app.lib
-  const path = await getAttachmentPath.call(this, id, field, file)
+  const { fs, fastGlob } = this.app.lib
+  const fullPath = await getAttachmentPath.call(this, id, field, file)
   const { req } = opts
-  await fs.remove(path)
+  await fs.remove(fullPath)
+  const dir = path.dirname(fullPath)
+  const ext = path.extname(fullPath)
+  const base = path.basename(fullPath, ext)
+  const pattern = `${dir}/_tn/${base}-*.*`
+  const files = await fastGlob(pattern)
+  for (const f of files) {
+    await fs.remove(f)
+  }
   if (!opts.noFlash && req && req.flash) req.flash('notify', req.t('attachmentRemoved'))
 }
 

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

@@ -45,13 +45,13 @@ async function removeRecord (...args) {
   await execModelHook.call(this, 'beforeRemoveRecord', id, options)
   await execDynHook.call(this, 'beforeRemoveRecord', id, options)
   const result = options.record ?? (await this.driver._removeRecord(this, id, options)) ?? {}
+  await handleReq.call(this, result.oldData.id, 'removed', options)
   await clearCache.call(this, id)
   if (noResult) return
   const { warnings } = getDefaultValues(options)
   if (!warnings) delete result.warnings
   if (!noResultSanitizer) result.oldData = await this.sanitizeRecord(result.oldData, options)
   if (isSet(options.refs)) await getSingleRef.call(this, result.data, options)
-  await handleReq.call(this, result.oldData.id, 'removed', options)
   await execDynHook.call(this, 'afterRemoveRecord', id, result, options)
   await execModelHook.call(this, 'afterRemoveRecord', id, result, options)
   await execHook.call(this, 'afterRemoveRecord', 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

@@ -67,16 +67,16 @@ async function updateRecord (...args) {
   await execDynHook.call(this, 'beforeUpdateRecord', id, input, options)
   if (!noValidation) await execValidation.call(this, input, options)
   const result = options.record ?? (await this.driver._updateRecord(this, id, input, options)) ?? {}
+  await handleReq.call(this, result.data.id, 'updated', options)
   await clearCache.call(this, id)
   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)
   await execHook.call(this, 'afterUpdateRecord', id, input, result, options)

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

@@ -16,13 +16,13 @@ async function native (body = {}, opts = {}) {
   await execModelHook.call(this, 'beforeUpsertRecord', input, options)
   await execDynHook.call(this, 'beforeUpsertRecord', input, options)
   const result = options.record ?? (await this.driver._upsertRecord(this, input, options)) ?? {}
+  await handleReq.call(this, result.data.id, 'upserted', options)
   await clearCache.call(this, body.id)
   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)
-  await handleReq.call(this, result.data.id, 'upserted', options)
+  if (!noResultSanitizer) result.data = await this.sanitizeRecord(result.data, options)
   await execDynHook.call(this, 'afterUpsertRecord', input, result, options)
   await execModelHook.call(this, 'afterUpsertRecord', input, result, options)
   await execHook.call(this, 'afterUpsertRecord', input, result, options)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,24 @@
 # Changes
 
+## 2026-05-02
+
+- [2.22.0] Add auto thumbnail creation when image attachment is uploaded
+- [2.22.0] Add feature to get the thumbnail instead of attachment file in attachment route
+- [2.22.0] Add ```dobo:image``` feature
+- [2.22.0] Bug fix in ```model.createRecord()```
+- [2.22.0] Bug fix in ```model.updateRecord()```
+- [2.22.0] Bug fix in ```model.upsertRecord()```
+- [2.22.0] Bug fix in ```model.removeRecord()```
+- [2.22.0] Remove attachment now also remove corresponding thumbnails
+
+## 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```