dobo 2.21.1 → 2.22.1

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

@@ -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

@@ -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,32 @@
+import path from 'path'
+
+async function handler (val, rec, opts) {
+  const atts = await this.listAttachment({ id: rec.id })
+  if (atts.length === 0) return
+  let items = atts.filter(att => att.mimeType.startsWith('image/'))
+  if (opts.asLink && 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 opts.returnAsArray ? items : items.join(', ')
+}
+
+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) {
+        return await handler.call(this, val, rec, { ...opts, asLink: false })
+      },
+      format: async function (val, rec) {
+        return await handler.call(this, val, rec, { ...opts, asLink: true })
+      }
+    }
+  }
+}
+
+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

@@ -33,7 +33,7 @@ async function sanitizeProp (model, prop, indexes) {
   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)

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 (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)
   await execHook.call(this, 'afterCreateRecord', input, 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/update-record.js

@@ -67,6 +67,7 @@ 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)
@@ -76,7 +77,6 @@ async function updateRecord (...args) {
     result.data = await this.sanitizeRecord(result.data, options)
     result.oldData = await this.sanitizeRecord(result.oldData, 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 (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)
   await execHook.call(this, 'afterUpsertRecord', input, result, options)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,20 @@
 # Changes
 
+## 2026-05-03
+
+- [2.22.1] Bug fix in ```dobo:image``` feature
+
+## 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```